strip trailing dots in frontend

Author: aviatesk

src/datatip.jl

@@ -6,26 +6,25 @@ atom-ide-ui is already deprecated, ugly, not fully functional, and and...
 handle("datatip") do data
   @destruct [
     word,
-    fullWord,
     mod || "Main",
     path || "",
     column || 1,
     row || 1,
     startRow || 0,
     context || ""
   ] = data
-  datatip(word, fullWord, mod, path, column, row, startRow, context)
+  datatip(word, mod, path, column, row, startRow, context)
 end
 
-function datatip(word, fullword, mod, path, column = 1, row = 1, startrow = 0, context = "")
+function datatip(word, mod, path, column = 1, row = 1, startrow = 0, context = "")
   if isdebugging() && (ddt = JunoDebugger.datatip(word, path, row, column)) !== nothing
     return Dict(:error => false, :strings => ddt)
   end
 
-  ldt = localdatatip(fullword, column, row, startrow, context)
-  isempty(ldt) || return push!(datatip(ldt), :local => true)
+  ldt = localdatatip(word, column, row, startrow, context)
+  isempty(ldt) || return datatip(ldt)
 
-  tdt = globaldatatip(mod, word, fullword)
+  tdt = globaldatatip(mod, word)
   tdt !== nothing && return Dict(:error => false, :strings => tdt)
 
   return Dict(:error => true) # nothing hits
@@ -35,8 +34,8 @@ datatip(dt::Vector{Dict{Symbol, Any}}) = Dict(:error => false, :strings => dt)
 datatip(dt::Int) = Dict(:error => false, :line => dt)
 datatip(dt::Vector{Int}) = datatip(dt[1])
 
-function localdatatip(fullword, column, row, startrow, context)
-  word = first(split(fullword, '.')) # always ignore dot accessors
+function localdatatip(word, column, row, startrow, context)
+  word = first(split(word, '.')) # always ignore dot accessors
   position = row - startrow
   ls = locals(context, position, column)
   filter!(ls) do l
@@ -56,9 +55,7 @@ function localdatatip(l, word, startrow)
   end
 end
 
-function globaldatatip(mod, word, fullword)
-  word = striptrailingdots(word, fullword)
-
+function globaldatatip(mod, word)
   docs = @errs getdocs(mod, word)
   docs isa EvalError && return nothing
 

src/goto.jl

@@ -3,7 +3,6 @@ using CSTParser
 handle("gotosymbol") do data
   @destruct [
     word,
-    fullWord,
     path || nothing,
     # local context
     column || 1,
@@ -16,30 +15,29 @@ handle("gotosymbol") do data
     text || "",
   ] = data
   gotosymbol(
-    word, fullWord, path,
+    word, path,
     column, row, startRow, context, onlyGlobal,
     mod, text
   )
 end
 
 function gotosymbol(
-  word, fullword, path = nothing,
+  word, path = nothing,
   column = 1, row = 1, startrow = 0, context = "", onlyglobal = false,
   mod = "Main", text = ""
 )
   try
     # local goto
     if !onlyglobal
-      localitems = localgotoitem(fullword, path, column, row, startrow, context)
+      localitems = localgotoitem(word, path, column, row, startrow, context)
       isempty(localitems) || return Dict(
         :error => false,
-        :items => map(Dict, localitems),
-        :local => true
+        :items => map(Dict, localitems)
       )
     end
 
     # global goto
-    globalitems = globalgotoitems(word, fullword, mod, text, path)
+    globalitems = globalgotoitems(word, mod, text, path)
     isempty(globalitems) || return Dict(
       :error => false,
       :items => map(Dict, globalitems),
@@ -67,8 +65,8 @@ Dict(gotoitem::GotoItem) = Dict(
 
 ### local goto
 
-function localgotoitem(fullword, path, column, row, startrow, context)
-  word = first(split(fullword, '.')) # always ignore dot accessors
+function localgotoitem(word, path, column, row, startrow, context)
+  word = first(split(word, '.')) # always ignore dot accessors
   position = row - startrow
   ls = locals(context, position, column)
   filter!(ls) do l
@@ -85,14 +83,12 @@ localgotoitem(word, ::Nothing, column, row, startrow, context) = [] # when `path
 
 ### global goto - bundles toplevel gotos & method gotos
 
-function globalgotoitems(word, fullword, mod, text, path)
+function globalgotoitems(word, mod, text, path)
   mod = getmodule(mod)
 
   moduleitems = modulegotoitems(word, mod)
   isempty(moduleitems) || return moduleitems
 
-  word = striptrailingdots(word, fullword)
-
   toplevelitems = toplevelgotoitems(word, mod, text, path)
 
   # only append methods that are not caught by `toplevelgotoitems`
@@ -126,12 +122,11 @@ const SYMBOLSCACHE = Dict{String, PathItemsMaps}()
 function toplevelgotoitems(word, mod, text, path)
   # strip a dot-accessed module if exists
   identifiers = split(word, '.')
-  head = identifiers[1]
-  if head ≠ word && (val = getfield′(mod, string(head))) isa Module
+  head = string(identifiers[1])
+  if head ≠ word && getfield′(mod, head) isa Module
     # if `head` is a module, update `word` and `mod`
     nextword = join(identifiers[2:end], '.')
-    nextmod = val
-    return toplevelgotoitems(nextword, nextmod, text, path)
+    return globalgotoitems(nextword, head, text, path)
   end
 
   key = string(mod)

src/utils.jl

@@ -140,18 +140,10 @@ end
 shortstr(val) = strlimit(string(val), 20)
 
 """
-    striptrailingdots(word::AbstractString, fullword::AbstractString)
+    Undefined
 
-Strips all the dot-accessors after `word` in `fullword`.
+singleton type representing undefined values
 """
-function striptrailingdots(word::AbstractString, fullword::AbstractString)
-  words = split(fullword, '.')
-  ind = findfirst(w -> w == word, words)
-  ind === nothing && return word # invalid case
-  return join(words[1:ind], '.')
-end
-
-# singleton type for undefined values
 struct Undefined end
 
 # get utilities

test/datatip.jl

@@ -81,7 +81,7 @@
             datatipmethodtest() = nothing
         end
 
-        let datatip = globaldatatip("Main", "datatipmethodtest", "datatipmethodtest")
+        let datatip = globaldatatip("Main", "datatipmethodtest")
             @test datatip isa Vector
             firsttip = datatip[1]
             secondtip = datatip[2]
@@ -94,16 +94,11 @@
         ## variable datatip
         @eval Main datatipvariabletest = "this string should be shown in datatip"
 
-        let datatip = globaldatatip("Main", "datatipvariabletest", "datatipvariabletest")
+        let datatip = globaldatatip("Main", "datatipvariabletest")
             @test datatip isa Vector
             firsttip = datatip[1]
             @test firsttip[:type] == :snippet
             @test occursin(r"this string should be shown in datatip", firsttip[:value])
         end
-
-        ## strips training dots
-        let item = globaldatatip("Atom", "SYMBOLSCACHE", "SYMBOLSCACHE")
-            @test item == globaldatatip("Atom", "SYMBOLSCACHE", "SYMBOLSCACHE.keys")
-        end
     end
 end

test/goto.jl

@@ -195,11 +195,7 @@
     end
 
     @testset "regenerating symbols" begin
-        # @info "––– caching symbols in loaded modules (only errors shown) ------"
-        # with_logger(ConsoleLogger(stderr, Base.CoreLogging.Warn)) do
         regeneratesymbols()
-        # end
-        # @info "––– finished caching -------------------------------------------"
 
         @test haskey(SYMBOLSCACHE, "Base")
         @test length(keys(SYMBOLSCACHE["Base"])) > 100
@@ -244,21 +240,10 @@
     @testset "goto global symbols" begin
         # both the original methods and the toplevel bindings that are overloaded
         # in a context module should be shown
-        let items = globalgotoitems("isconst", "isconst", "Main.Junk", "", nothing)
+        let items = globalgotoitems("isconst", "Main.Junk", "", nothing)
             @test length(items) === 2
             @test "isconst(m::Module, s::Symbol)" ∈ map(item -> item.text, items) # from Base
             @test "Base.isconst(::JunkType)" ∈ map(item -> item.text, items) # from Junk
         end
-
-        # strips trailing dots
-        let item = globalgotoitems("isconst", "isconst", "Main.Junk", "", nothing)
-            @test item == globalgotoitems("isconst", "Junk.isconst", "Main.Junk", "", nothing)
-            @test item == globalgotoitems("isconst", "Main.Junk.isconst", "Main.Junk", "", nothing)
-        end
-        let item = globalgotoitems("Junk", "Junk", "Main.Junk", "", nothing)
-            @test item == globalgotoitems("Junk", "Main.Junk", "Main.Junk", "", nothing)
-            @test item == globalgotoitems("Junk", "Junk.isconst", "Main.Junk", "", nothing)
-            @test item == globalgotoitems("Junk", "Main.Junk.isconst", "Main.Junk", "", nothing)
-        end
     end
 end

test/utils.jl

@@ -114,18 +114,3 @@ end
         @test strlimit("Jμλια in the Nutshell", 20, " ...") == "Jμλια in the Nut ..."
     end
 end
-
-@testset "strip trailing dots" begin
-    using Atom: striptrailingdots
-
-    # only including ASCII
-    @test striptrailingdots("field", "Head.field") == "Head.field"
-    @test striptrailingdots("Head", "Head.field") == "Head"
-
-    # including Unicode
-    @test striptrailingdots("fιηλδ", "Hηαδ.fιηλδ") == "Hηαδ.fιηλδ"
-    @test striptrailingdots("Hηαδ", "Hηαδ.fιηλδ") == "Hηαδ"
-
-    # invalid case
-    @test_nowarn striptrailingdots("foo", "head.field")
-end