strip trailing dots

Author: aviatesk

src/datatip.jl

@@ -7,25 +7,26 @@ Once we can come to handle links within datatips, we may want to append method t
 handle("datatip") do data
   @destruct [
     word,
+    fullWord,
     mod || "Main",
     path || "",
     column || 1,
     row || 1,
     startRow || 0,
     context || ""
   ] = data
-  datatip(word, mod, path, column, row, startRow, context)
+  datatip(word, fullWord, mod, path, column, row, startRow, context)
 end
 
-function datatip(word, mod, path, column = 1, row = 1, startrow = 0, context = "")
+function datatip(word, fullword, 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(word, column, row, startrow, context)
-  isempty(ldt) || return datatip(ldt)
+  ldt = localdatatip(fullword, column, row, startrow, context)
+  isempty(ldt) || return push!(datatip(ldt), :local => true)
 
-  tdt = topleveldatatip(mod, word)
+  tdt = globaldatatip(mod, word, fullword)
   tdt !== nothing && return Dict(:error => false, :strings => tdt)
 
   return Dict(:error => true) # nothing hits
@@ -35,8 +36,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(word, column, row, startrow, context)
-  word = first(split(word, '.')) # ignore dot accessors
+function localdatatip(fullword, column, row, startrow, context)
+  word = first(split(fullword, '.')) # always ignore dot accessors
   position = row - startrow
   ls = locals(context, position, column)
   filter!(ls) do l
@@ -56,7 +57,9 @@ function localdatatip(l, word, startrow)
   end
 end
 
-function topleveldatatip(mod, word)
+function globaldatatip(mod, word, fullword)
+  word = striptrailingdots(word, fullword)
+
   docs = @errs getdocs(mod, word)
   docs isa EvalError && return nothing
 

src/goto.jl

@@ -3,6 +3,7 @@ using CSTParser
 handle("gotosymbol") do data
   @destruct [
     word,
+    fullWord,
     path || nothing,
     # local context
     column || 1,
@@ -15,29 +16,30 @@ handle("gotosymbol") do data
     text || "",
   ] = data
   gotosymbol(
-    word, path,
+    word, fullWord, path,
     column, row, startRow, context, onlyGlobal,
     mod, text
   )
 end
 
 function gotosymbol(
-  word, path = nothing,
+  word, fullword, path = nothing,
   column = 1, row = 1, startrow = 0, context = "", onlyglobal = false,
   mod = "Main", text = ""
 )
   try
     # local goto
     if !onlyglobal
-      localitems = localgotoitem(word, path, column, row, startrow, context)
+      localitems = localgotoitem(fullword, path, column, row, startrow, context)
       isempty(localitems) || return Dict(
         :error => false,
         :items => map(Dict, localitems),
+        :local => true
       )
     end
 
     # global goto
-    globalitems = globalgotoitems(word, mod, text, path)
+    globalitems = globalgotoitems(word, fullword, mod, text, path)
     isempty(globalitems) || return Dict(
       :error => false,
       :items => map(Dict, globalitems),
@@ -65,8 +67,8 @@ Dict(gotoitem::GotoItem) = Dict(
 
 ### local goto
 
-function localgotoitem(word, path, column, row, startrow, context)
-  word = first(split(word, '.')) # ignore dot accessors
+function localgotoitem(fullword, path, column, row, startrow, context)
+  word = first(split(fullword, '.')) # always ignore dot accessors
   position = row - startrow
   ls = locals(context, position, column)
   filter!(ls) do l
@@ -83,12 +85,14 @@ localgotoitem(word, ::Nothing, column, row, startrow, context) = [] # when `path
 
 ### global goto - bundles toplevel gotos & method gotos
 
-function globalgotoitems(word, mod, text, path)
+function globalgotoitems(word, fullword, 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`

src/utils.jl

@@ -99,6 +99,15 @@ function md_hlines(md)
   return MD(v)
 end
 
+"""
+    strlimit(str::AbstractString, limit::Int = 30, ellipsis::AbstractString = "…")
+
+Chops off `str` so that its _length_ doesn't exceed `limit`. The excessive part
+  will be replaced by `ellipsis`.
+
+!!! note
+    The length of returned string will _never_ exceed `limit`.
+"""
 function strlimit(str::AbstractString, limit::Int = 30, ellipsis::AbstractString = "…")
   will_append = length(str) > limit
 
@@ -118,6 +127,18 @@ end
 
 shortstr(val) = strlimit(string(val), 20)
 
+"""
+    striptrailingdots(word::AbstractString, fullword::AbstractString)
+
+Strips all the dot-accessors after `word` in `fullword`.
+"""
+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