Merge branch 'master' into disable-comp

Author: pfitzseb

.github/workflows/jlpkgbutler-ci-master-workflow.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6']
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         exclude:

.github/workflows/jlpkgbutler-ci-pr-workflow.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6']
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         exclude:

.github/workflows/jlpkgbutler-tagbot-workflow.yml

@@ -1,9 +1,12 @@
 name: TagBot
 on:
-  schedule:
-    - cron: 0 * * * *
+  issue_comment:
+    types:
+      - created
+  workflow_dispatch:
 jobs:
   TagBot:
+    if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
     runs-on: ubuntu-latest
     steps:
       - uses: JuliaRegistries/TagBot@v1

Project.toml

@@ -1,13 +1,14 @@
 name = "LanguageServer"
 uuid = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7"
-version = "3.2.1-DEV"
+version = "4.2.1-DEV"
 
 [deps]
 CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
-DocumentFormat = "ffa9a821-9c82-50df-894e-fbcef3ed31cd"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JSONRPC = "b9b8584e-8fd3-41f9-ad0c-7255d428e418"
+JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 StaticLint = "b3cc710f-9c33-5bdb-a03d-a94903873e97"
 SymbolServer = "cf896787-08d5-524d-9de7-132aaa0cb996"
@@ -16,23 +17,22 @@ URIParser = "30578b45-9adc-5946-b283-645ec420af67"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-CSTParser = "3.1"
-DocumentFormat = "3.2.2"
+CSTParser = "3.3"
 JSON = "0.20, 0.21"
 JSONRPC = "1.1"
-StaticLint = "7, 8.0"
-SymbolServer = "6, 7.0"
+JuliaFormatter = "0.20.0, 0.21, 0.22"
+StaticLint = "8.0"
+SymbolServer = "7.1"
 Tokenize = "0.5.10"
 URIParser = "0.4.1"
 julia = "1"
 
 [extras]
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Sockets", "Pkg", "LibGit2", "Serialization", "SHA"]
+test = ["Test", "Sockets", "LibGit2", "Serialization", "SHA"]

README.md

@@ -34,7 +34,7 @@ Julia as follows:
 
 ```sh
 julia --project=/path/to/LanguageServer.jl/environment \
-  -e "using LanguageServer, LanguageServer.SymbolServer; runserver()" \
+  -e "using LanguageServer; runserver()" \
   <env_path>
 ```
 

src/LanguageServer.jl

@@ -1,7 +1,7 @@
 module LanguageServer
 import URIParser
-using JSON, REPL, CSTParser, DocumentFormat, SymbolServer, StaticLint
-using CSTParser: EXPR, Tokenize.Tokens, Tokenize.Tokens.kind, headof, parentof, valof
+using JSON, REPL, CSTParser, JuliaFormatter, SymbolServer, StaticLint
+using CSTParser: EXPR, Tokenize.Tokens, Tokenize.Tokens.kind, headof, parentof, valof, to_codeobject
 using StaticLint: refof, scopeof, bindingof
 using UUIDs
 using Base.Docs, Markdown
@@ -16,6 +16,7 @@ include("protocol/protocol.jl")
 include("extensions/extensions.jl")
 include("document.jl")
 include("languageserverinstance.jl")
+include("multienv.jl")
 include("runserver.jl")
 include("staticlint.jl")
 

src/document.jl

@@ -32,6 +32,9 @@ function set_doc(x::EXPR, doc)
     x.meta.error = doc
 end
 
+function get_path(doc)
+    return doc._path
+end
 
 function get_text(doc::Document)
     return doc._content
@@ -65,7 +68,7 @@ end
 """
     get_offset(doc, line, char)
 
-Returns the byte offset position corresponding to a line/character position.
+Returns the 0 based byte offset position corresponding to a line/character position.
 This takes 0 based line/char inputs. Corresponding functions are available for
 Position and Range arguments, the latter returning a UnitRange{Int}.
 """
@@ -99,6 +102,7 @@ get_offset(doc, p::Position) = get_offset(doc, p.line, p.character)
 get_offset(doc, r::Range) = get_offset(doc, r.start):get_offset(doc, r.stop)
 
 # 1-based. Basically the index at which (line, character) can be found in the document.
+get_offset2(doc::Document, p::Position, forgiving_mode=false) =  get_offset2(doc, p.line, p.character, forgiving_mode)
 function get_offset2(doc::Document, line::Integer, character::Integer, forgiving_mode=false)
     line_offsets = get_line_offsets2!(doc)
     text = get_text(doc)
@@ -131,9 +135,12 @@ function get_offset2(doc::Document, line::Integer, character::Integer, forgiving
         pos = nextind(text, pos)
     end
 
-return pos
+    return pos
 end
 
+# get_offset, but correct
+get_offset3(args...) = get_offset2(args...) - 1
+
 # Note: to be removed
 function obscure_text(s)
     i = 1

src/extensions/messagedefs.jl

@@ -1,4 +1,4 @@
 const julia_getModuleAt_request_type = JSONRPC.RequestType("julia/getModuleAt", VersionedTextDocumentPositionParams, String)
-const julia_getCurrentBlockRange_request_type = JSONRPC.RequestType("julia/getCurrentBlockRange", VersionedTextDocumentPositionParams, Position)
+const julia_getCurrentBlockRange_request_type = JSONRPC.RequestType("julia/getCurrentBlockRange", VersionedTextDocumentPositionParams, Tuple{Position, Position, Position})
 const julia_getDocAt_request_type = JSONRPC.RequestType("julia/getDocAt", VersionedTextDocumentPositionParams, String)
 const julia_getDocFromWord_request_type = JSONRPC.RequestType("julia/getDocFromWord", NamedTuple{(:word,),Tuple{String}}, String)