Move position functions to utils

Author: mlechu

src/JETLS.jl

@@ -12,8 +12,6 @@ using .LSP
 include("JSONRPC.jl")
 using .JSONRPC
 
-include("utils.jl")
-
 using Pkg, JuliaSyntax, JET
 
 struct FileInfo
@@ -74,6 +72,7 @@ function ServerState(send::F) where F
         Ref{String}())
 end
 
+include("utils.jl")
 include("completions.jl")
 
 struct IncludeCallback <: Function
@@ -149,7 +148,6 @@ function handle_message(state::ServerState, msg)
     elseif msg isa DocumentDiagnosticRequest || msg isa WorkspaceDiagnosticRequest
         @assert false
     elseif msg isa CompletionRequest
-        @info "CompletionRequest" msg
         try
             return handle_CompletionRequest(state, msg)
         catch e

src/completions.jl

@@ -1,47 +1,9 @@
 import JuliaLowering: SyntaxTree, JuliaLowering as JL
 import JuliaSyntax: @K_str, @KSet_str, JuliaSyntax as JS
 
-"""
-Fetch cached FileInfo given an LSclient-provided structure with a URI
-"""
-function get_fileinfo(s::ServerState, t::TextDocumentIdentifier)
-    uri = URI(t.uri)
-    return haskey(s.file_cache, uri) ? s.file_cache[uri] : nothing
-end
 # get_fileinfo(s::ServerState, t::TextDocumentPositionParams) = get_fileinfo(s, t.textDocument)
 get_fileinfo(s::ServerState, t::CompletionParams) = get_fileinfo(s, t.textDocument)
 
-# JuliaLowering uses byte offsets; LSP uses lineno and UTF-* character offset.
-# These functions do the conversion.
-
-"""
-Convert 0-based `(;line = y, character = x)` to a 1-based byte offset
-"""
-function xy_to_offset(fi::FileInfo, pos::Position)
-    code = fi.parsed_stream.textbuf
-    b = 0
-    for z in 1:pos.line
-        b = findnext(isequal(UInt8('\n')), code, b + 1)
-    end
-    lend = findnext(isequal(UInt8('\n')), code, b + 1)
-    lend = isnothing(lend) ? lastindex(code) + 1 : lend
-    s = String(code[b+1:lend-1]) # current line, containing no newlines
-    line_b = 1
-    for i in 1:pos.character
-        line_b = nextind(s, line_b)
-    end
-    return b + line_b
-end
-
-"""
-Convert a 1-based byte offset to a 0-based line and character number
-"""
-function offset_to_xy(fi::FileInfo, b::Integer)
-    sf = JuliaSyntax.SourceFile(fi.parsed_stream)
-    l, c = JuliaSyntax.source_location(sf, b)
-    return Position(;line = l-1, character = c-1)
-end
-
 """
 Like `Base.unique`, but over node ids, and with this comment promising that the
 lowest-index copy of each node is kept.

src/utils.jl

@@ -38,3 +38,42 @@ let throttled = Dict{UInt, Tuple{Union{Nothing,Timer}, Float64}}()
         nothing
     end
 end
+
+"""
+Fetch cached FileInfo given an LSclient-provided structure with a URI
+"""
+function get_fileinfo(s::ServerState, t::TextDocumentIdentifier)
+    uri = URI(t.uri)
+    return haskey(s.file_cache, uri) ? s.file_cache[uri] : nothing
+end
+
+# JuliaLowering uses byte offsets; LSP uses lineno and UTF-* character offset.
+# These functions do the conversion.
+
+"""
+Convert 0-based `(;line = y, character = x)` to a 1-based byte offset
+"""
+function xy_to_offset(fi::FileInfo, pos::Position)
+    code = fi.parsed_stream.textbuf
+    b = 0
+    for z in 1:pos.line
+        b = findnext(isequal(UInt8('\n')), code, b + 1)
+    end
+    lend = findnext(isequal(UInt8('\n')), code, b + 1)
+    lend = isnothing(lend) ? lastindex(code) + 1 : lend
+    s = String(code[b+1:lend-1]) # current line, containing no newlines
+    line_b = 1
+    for i in 1:pos.character
+        line_b = nextind(s, line_b)
+    end
+    return b + line_b
+end
+
+"""
+Convert a 1-based byte offset to a 0-based line and character number
+"""
+function offset_to_xy(fi::FileInfo, b::Integer)
+    sf = JuliaSyntax.SourceFile(fi.parsed_stream)
+    l, c = JuliaSyntax.source_location(sf, b)
+    return Position(;line = l-1, character = c-1)
+end