julia-vscode icon indicating copy to clipboard operation
julia-vscode copied to clipboard

Bad behavior during git merge

Open Octogonapus opened this issue 2 years ago • 0 comments

When handling a merge conflict in the Project.toml file, the language server will encounter this error:

┌ Error: The Julia environment at `/home/salmon/Documents/xxx/xxx.jl/Project.toml` is invalid. Using the global environment instead.
│   exception =
│    TOML Parser error:
│    /home/salmon/Documents/xxx/xxx.jl/Project.toml:98:1 error: invalid bare key character: '<'
│      <<<<<<< HEAD
│      ^            
│    Stacktrace:
│      [1] parse
│        @ ./toml_parser.jl:445 [inlined]
│      [2] Base.CachedTOMLDict(p::Base.TOML.Parser, path::String)
│        @ Base ./loading.jl:222
│      [3] (::Base.var"#938#939"{String, Base.TOMLCache})()
│        @ Base ./loading.jl:278
│      [4] lock(f::Base.var"#938#939"{String, Base.TOMLCache}, l::ReentrantLock)
│        @ Base ./lock.jl:229
│      [5] parsed_toml
│        @ ./loading.jl:275 [inlined]
│      [6] parsed_toml
│        @ ./loading.jl:273 [inlined]
│      [7] parsed_toml
│        @ ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/multienv.jl:4 [inlined]
│      [8] get_env_for_root(doc::LanguageServer.Document, server::LanguageServerInstance)
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/multienv.jl:61
│      [9] setroot(doc::LanguageServer.Document, root::LanguageServer.Document)
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/staticlint.jl:54
│     [10] LanguageServer.Document(text_document::LanguageServer.TextDocument, workspace_file::Bool, server::LanguageServerInstance)
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/document.jl:17
│     [11] load_folder(path::String, server::LanguageServerInstance)
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/requests/init.jl:117
│     [12] initialized_notification(params::LanguageServer.InitializedParams, server::LanguageServerInstance, conn::JSONRPC.JSONRPCEndpoint{Base.PipeEndpoint, Base.PipeEndpoint})
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/requests/init.jl:209
│     [13] (::LanguageServer.var"#111#112"{typeof(LanguageServer.initialized_notification), LanguageServerInstance})(conn::JSONRPC.JSONRPCEndpoint{Base.PipeEndpoint, Base.PipeEndpoint}, params::LanguageServer.InitializedParams)
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/languageserverinstance.jl:265
│     [14] dispatch_msg(x::JSONRPC.JSONRPCEndpoint{Base.PipeEndpoint, Base.PipeEndpoint}, dispatcher::JSONRPC.MsgDispatcher, msg::Dict{String, Any})
│        @ JSONRPC ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/JSONRPC/src/typed.jl:67
│     [15] run(server::LanguageServerInstance; timings::Vector{Any})
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/languageserverinstance.jl:394
│     [16] run(server::LanguageServerInstance)
│        @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/languageserverinstance.jl:275
│     [17] top-level scope
│        @ ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/languageserver/main.jl:104
│     [18] include(mod::Module, _path::String)
│        @ Base ./Base.jl:457
│     [19] exec_options(opts::Base.JLOptions)
│        @ Base ./client.jl:307
│     [20] _start()
│        @ Base ./client.jl:522
└ @ LanguageServer ~/.vscode/extensions/julialang.language-julia-1.54.2/scripts/packages/LanguageServer/src/multienv.jl:97

This happens multiple times per second and overlaps other vscode UI elements making it impossible to use the merge editor.

Octogonapus avatar Oct 12 '23 04:10 Octogonapus