Merge branch 'master' into fix-lsp-prot-def

Author: davidanthoff

src/document.jl

@@ -102,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)
@@ -134,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/requests/completions.jl

@@ -41,7 +41,7 @@ end
 function textDocument_completion_request(params::CompletionParams, server::LanguageServerInstance, conn)
     state = let
         doc = getdocument(server, URI2(params.textDocument.uri))
-        offset = get_offset(doc, params.position)
+        offset = get_offset3(doc, params.position)
         rng = Range(doc, offset:offset)
         x = get_expr(getcst(doc), offset)
         using_stmts = server.completion_mode == :import ? get_preexisting_using_stmts(x, doc) : Dict()
@@ -100,7 +100,7 @@ end
 
 
 function get_partial_completion(state::CompletionState)
-    ppt, pt, t = toks = get_toks(state.doc, state.offset)
+    ppt, pt, t = get_toks(state.doc, state.offset)
     is_at_end = state.offset == t.endbyte + 1
     return ppt, pt, t, is_at_end
 end
@@ -161,7 +161,7 @@ const snippet_completions = Dict{String,String}(
 
 
 function texteditfor(state::CompletionState, partial, n)
-    TextEdit(Range(Position(state.range.start.line, state.range.start.character - sizeof(partial)), state.range.stop), n)
+    TextEdit(Range(Position(state.range.start.line, max(state.range.start.character - length(partial), 0)), state.range.stop), n)
 end
 
 function collect_completions(m::SymbolServer.ModuleStore, spartial, state::CompletionState, inclexported=false, dotcomps=false)
@@ -319,14 +319,15 @@ function string_completion(t, state::CompletionState)
     path_completion(t, state)
     # Need to adjust things for quotation marks
     if t.kind in (CSTParser.Tokenize.Tokens.STRING,CSTParser.Tokenize.Tokens.CMD)
-        t.startbyte < state.offset <= t.endbyte || return
+        t.startbyte + 1 < state.offset <= t.endbyte || return
         relative_offset = state.offset - t.startbyte - 1
         content = t.val[2:prevind(t.val, lastindex(t.val))]
     else
-        t.startbyte < state.offset <= t.endbyte - 2 || return
+        t.startbyte + 3 < state.offset <= t.endbyte - 2 || return
         relative_offset = state.offset - t.startbyte - 3
         content = t.val[4:prevind(t.val, lastindex(t.val), 3)]
     end
+    relative_offset = clamp(relative_offset, firstindex(content), lastindex(content))
     partial = is_latex_comp(content, relative_offset)
     !isempty(partial) && latex_completions(partial, state)
 end

test/requests/completions.jl

@@ -12,16 +12,16 @@ completion_test(line, char) = LanguageServer.textDocument_completion_request(Lan
     """)
     @test completion_test(0, 9).items[1].textEdit.newText == "∴"
     @test completion_test(0, 9).items[1].textEdit.range == LanguageServer.Range(0, 0, 0, 9)
-    
+
     @test completion_test(1, 10).items[1].textEdit.newText == "∴"
     @test completion_test(1, 10).items[1].textEdit.range == LanguageServer.Range(1, 1, 1, 10)
-    
+
     @test completion_test(2, 10).items[1].textEdit.newText == "∴"
     @test completion_test(2, 10).items[1].textEdit.range == LanguageServer.Range(2, 1, 2, 10)
-    
+
     @test completion_test(3, 10).items[1].textEdit.newText == "∴"
     @test completion_test(3, 10).items[1].textEdit.range == LanguageServer.Range(3, 1, 3, 10)
-    
+
     @test completion_test(4, 12).items[1].textEdit.newText == "∴"
     @test completion_test(4, 12).items[1].textEdit.range == LanguageServer.Range(4, 3, 4, 12)
 
@@ -41,7 +41,7 @@ end
 
     settestdoc("import ")
     @test all(item.label in ("Main", "Base", "Core") for item in completion_test(0, 7).items)
-    
+
     settestdoc("""module M end
     import .""")
     @test_broken completion_test(1, 8).items[1].label == "M"
@@ -70,7 +70,7 @@ end
     @test any(item.label == "quot" for item in completion_test(1, 10).items)
 
     settestdoc("""
-    module M 
+    module M
     inner = 1
     end
     M.
@@ -94,8 +94,6 @@ end
     @test all(item.label in ("f1", "f2") for item in completion_test(1, 2).items)
 end
 
-
-
 @testset "token completions" begin
     settestdoc("B")
     @test any(item.label == "Base" for item in completion_test(0, 1).items)
@@ -105,25 +103,33 @@ end
 
     settestdoc("@t")
     @test any(item.label == "@time" for item in completion_test(0, 2).items)
-    
+
     settestdoc("i")
     @test any(item.label == "if" for item in completion_test(0, 1).items)
-    
+
     settestdoc("i")
     @test any(item.label == "in" for item in completion_test(0, 1).items)
-    
+
     settestdoc("for")
     @test any(item.label == "for" for item in completion_test(0, 3).items)
 
     settestdoc("in")
     @test any(item.label == "in" for item in completion_test(0, 2).items)
-    
+
     settestdoc("isa")
     @test any(item.label == "isa" for item in completion_test(0, 3).items)
 end
 
 @testset "scope var completions" begin
-    settestdoc("""myvar = 1
-    myv""")
-    @test any(item.label == "myvar" for item in completion_test(1, 3).items)
+    settestdoc("""
+    myvar = 1
+    βbb = 2
+    bβb = 3
+    myv
+    βb
+    bβ
+    """)
+    @test any(item.label == "myvar" for item in completion_test(3, 3).items)
+    @test any(item.label == "βbb" for item in completion_test(4, 2).items)
+    @test any(item.label == "bβb" for item in completion_test(5, 2).items)
 end