strip trailing dots in frontend

Author: aviatesk

lib/misc/words.js

@@ -21,47 +21,85 @@ export function withWord (editor, fn) {
  *
  * `options`
  * - `bufferPosition` {Point}: If given returns the word at the `bufferPosition`, returns the word at the current cursor otherwise.
- * - `wordRegex` {RegExp} : A RegExp indicating what constitutes a “word” (default: `wordRegex`).
+ * - `wordRegex` {RegExp} : A RegExp indicating what constitutes a “word”. Will be used if not both `beginWordRegex and `endWordRegex` are passed. (default: `wordRegex`).
+ * - `beginWordRegex` {RegExp} : A RegExp to find a beginning of a “word”. Should be passed with `endWordRegex`. (default: `undefined`).
+ * - `endWordRegex` {RegExp} : A RegExp to find an end of a “word”. Should be passed with `beginWordRegex`. (default: `undefined`).
  */
 export function getWordAndRange (editor, options = {
   bufferPosition: undefined,
-  wordRegex: wordRegex
+  wordRegex: wordRegex,
+  beginWordRegex: undefined,
+  endWordRegex: undefined
 }) {
   // @TODO?:
   // The following lines are kinda iffy: The regex may or may not be well chosen
   // and it duplicates the efforts from atom-language-julia.
   // It might be better to select the current word via finding the smallest <span>
   // containing the bufferPosition/cursor which also has `function` or `macro` as its class.
   const range = options.bufferPosition ?
-    getWordRangeAtBufferPosition(editor, options.bufferPosition, {
-      wordRegex: options.wordRegex ? options.wordRegex : wordRegex
-    }) :
-    editor.getLastCursor().getCurrentWordBufferRange({
-      wordRegex: options.wordRegex ? options.wordRegex : wordRegex
-    })
+    getWordRangeAtBufferPosition(editor, options.bufferPosition, options) :
+    getWordRangeAtBufferPosition(editor, editor.getLastCursor().getBufferPosition(), options)
   const word = editor.getTextInBufferRange(range)
   return { word, range }
 }
 
 /**
  * get the word under `bufferPosition` in `editor`
- * adapted from https://github.com/atom/atom/blob/v1.38.2/src/cursor.js#L606-L616
  *
  * `options`
- * - `wordRegex` {RegExp}: A RegExp indicating what constitutes a “word” (default: `wordRegex`).
+ * - `wordRegex` {RegExp}: A RegExp indicating what constitutes a “word”. Will be used if not both `beginWordRegex and `endWordRegex` are passed. (default: `wordRegex`).
+ * - `beginWordRegex` {RegExp} : A RegExp to find a beginning of a “word”. Should be passed with `endWordRegex`. (default: `undefined`).
+ * - `endWordRegex` {RegExp} : A RegExp to find an end of a “word”. Should be passed with `beginWordRegex`. (default: `undefined`).
  */
 export function getWordRangeAtBufferPosition(editor, bufferPosition, options = {
-  wordRegex: wordRegex
+  wordRegex: wordRegex,
+  beginWordRegex: undefined,
+  endWordRegex: undefined,
 }) {
-  const { row, column } = bufferPosition
-  const ranges = editor.getBuffer().findAllInRangeSync(
-    options.wordRegex ? options.wordRegex : wordRegex,
-    new Range(new Point(row, 0), new Point(row, Infinity))
-  )
-  const range = ranges.find(range =>
-    range.end.column >= column && range.start.column <= column
-  )
-  return range ? Range.fromObject(range) : new Range(bufferPosition, bufferPosition)
+  if (options.beginWordRegex && options.endWordRegex) {
+    // adapted from https://github.com/atom/atom/blob/1.42-releases/src/cursor.js#L572-L593
+    const beginRange = new Range(new Point(bufferPosition.row, 0), bufferPosition)
+    const beginRanges = editor.getBuffer().findAllInRangeSync(
+      options.beginWordRegex,
+      beginRange
+    )
+    let beginPosition
+    for (const range of beginRanges) {
+      if (bufferPosition.isLessThanOrEqual(range.start)) break
+      if (bufferPosition.isLessThanOrEqual(range.end)) {
+        beginPosition = Point.fromObject(range.start)
+      }
+    }
+    beginPosition = beginPosition || bufferPosition
+
+    // https://github.com/atom/atom/blob/1.42-releases/src/cursor.js#L605-L624
+    const endRange = new Range(bufferPosition, new Point(bufferPosition.row, Infinity));
+    const endRanges = editor.getBuffer().findAllInRangeSync(
+      options.endWordRegex,
+      endRange
+    )
+    let endPosition
+    for (const range of endRanges) {
+      if (bufferPosition.isLessThan(range.start)) break
+      if (bufferPosition.isLessThan(range.end)) {
+        endPosition = Point.fromObject(range.end)
+      }
+    }
+    endPosition = endPosition || bufferPosition
+
+    return new Range(beginPosition, endPosition)
+  } else {
+    // adapted from https://github.com/atom/atom/blob/v1.38.2/src/cursor.js#L606-L616
+    const { row, column } = bufferPosition
+    const ranges = editor.getBuffer().findAllInRangeSync(
+      options.wordRegex ? options.wordRegex : wordRegex,
+      new Range(new Point(row, 0), new Point(row, Infinity))
+    )
+    const range = ranges.find(range =>
+      range.end.column >= column && range.start.column <= column
+    )
+    return range ? Range.fromObject(range) : new Range(bufferPosition, bufferPosition)
+  }
 }
 
 /**

lib/runtime/datatip.js

@@ -12,6 +12,7 @@ import { client } from '../connection'
 import modules from './modules'
 import { isValidScopeToInspect } from '../misc/scopes'
 import {
+  wordRegex,
   wordRegexWithoutDotAccessor,
   getWordAndRange,
   isValidWordToInspect
@@ -38,17 +39,15 @@ class DatatipProvider {
     // If the scope at `bufferPosition` is not valid code scope, do nothing
     if (!isValidScopeToInspect(editor, bufferPosition)) return
 
-    // get word w/ w/o dots at the buffer position
+    // get word without trailing dot accessors at the buffer position
     const { range, word } = getWordAndRange(editor, {
       bufferPosition,
-      wordRegex: wordRegexWithoutDotAccessor
-    })
-    const { word: fullWord, range: fullRange } = getWordAndRange(editor, {
-      bufferPosition
+      beginWordRegex: wordRegex,
+      endWordRegex: wordRegexWithoutDotAccessor,
     })
 
     // check the validity of code to be inspected
-    if (!(isValidWordToInspect(word) && isValidWordToInspect(fullWord))) return
+    if (!(isValidWordToInspect(word))) return
 
     const { main, sub } = await modules.getEditorModule(editor, bufferPosition)
     const mod = main ? (sub ? `${main}.${sub}` : main) : 'Main'
@@ -59,7 +58,6 @@ class DatatipProvider {
     try {
       const result = await datatip({
         word,
-        fullWord,
         mod,
         path: editor.getPath(),
         column: column + 1,
@@ -72,7 +70,7 @@ class DatatipProvider {
         if (result.line) {
           const value = editor.lineTextForBufferRow(result.line).trim()
           return {
-            range: result.local ? fullRange : range,
+            range,
             markedStrings: [{
               type: 'snippet',
               value,
@@ -81,7 +79,7 @@ class DatatipProvider {
           }
         } else if (result.strings) {
           return {
-            range: result.local ? fullRange : range,
+            range,
             markedStrings: result.strings.map(string => {
               return {
                 type: string.type,
@@ -95,7 +93,7 @@ class DatatipProvider {
         if (result.line) {
           const value = editor.lineTextForBufferRow(result.line).trim()
           return {
-            range: result.local ? fullRange : range,
+            range,
             markedStrings: [{
               type: 'snippet',
               value,
@@ -105,7 +103,7 @@ class DatatipProvider {
         } else if (result.strings) {
           // @NOTE: atom-ide-datatip can't render multiple `snippet`s in `markedStrings` correctly
           return {
-            range: result.local ? fullRange : range,
+            range,
             markedStrings: result.strings.map(string => {
               return {
                 type: 'markdown',

lib/runtime/evaluation.coffee

@@ -86,8 +86,11 @@ module.exports =
 
   toggleDocs: (word, range) ->
     { editor, mod, edpath } = @_currentContext()
-    { word, range } = words.getWordAndRange(editor) unless word? and range?
-    if word.length == 0 || !isNaN(word) then return
+    { word, range } = words.getWordAndRange(editor,
+      beginWordRegex: words.wordRegex
+      endWordRegex: words.wordRegexWithoutDotAccessor
+    ) unless word? and range?
+    return unless words.isValidWordToInspect(word)
     searchDoc({word: word, mod: mod}).then (result) =>
       if result.error then return
       v = views.render result

lib/runtime/goto.js

@@ -8,6 +8,7 @@ import { client } from '../connection'
 import modules from './modules'
 import { isValidScopeToInspect } from '../misc/scopes'
 import {
+  wordRegex,
   wordRegexWithoutDotAccessor,
   getWordAndRange,
   getWordRangeAtBufferPosition,
@@ -80,17 +81,15 @@ class Goto {
 
     if (!this.isClientAndInkReady()) return
 
-    // get word w/ w/o dots at the buffer position
+    // get word without trailing dot accessors at the buffer position
     const { word } = getWordAndRange(editor, {
       bufferPosition,
-      wordRegex: wordRegexWithoutDotAccessor
-    })
-    const { word: fullWord } = getWordAndRange(editor, {
-      bufferPosition
+      beginWordRegex: wordRegex,
+      endWordRegex: wordRegexWithoutDotAccessor,
     })
 
     // check the validity of code to be inspected
-    if (!(isValidWordToInspect(word) && isValidWordToInspect(fullWord))) return
+    if (!(isValidWordToInspect(word))) return
 
     // local context
     const { column, row } = bufferPosition
@@ -103,7 +102,6 @@ class Goto {
 
     gotoSymbol({
       word,
-      fullWord,
       path: editor.getPath(),
       // local context
       column: column + 1,
@@ -145,17 +143,15 @@ class Goto {
       // If the scope at `bufferPosition` is not valid code scope, do nothing
       if (!isValidScopeToInspect(textEditor, bufferPosition)) return
 
-      // get word w/ w/o dots at the buffer position
+      // get word without trailing dot accessors at the buffer position
       const { word, range } = getWordAndRange(textEditor, {
         bufferPosition,
-        wordRegex: wordRegexWithoutDotAccessor
-      })
-      const { word: fullWord, range: fullRange } = getWordAndRange(textEditor, {
-        bufferPosition
+        beginWordRegex: wordRegex,
+        endWordRegex: wordRegexWithoutDotAccessor,
       })
 
       // check the validity of code to be inspected
-      if (!(isValidWordToInspect(word) && isValidWordToInspect(fullWord))) return
+      if (!(isValidWordToInspect(word))) return
 
       // local context
       const { column, row } = bufferPosition
@@ -169,7 +165,6 @@ class Goto {
       return new Promise((resolve) => {
         gotoSymbol({
           word,
-          fullWord,
           path: textEditor.getPath(),
           // local context
           column: column + 1,
@@ -189,7 +184,7 @@ class Goto {
             })
           }
           resolve({
-            range: results.local ? fullRange : range,
+            range,
             callback: () => {
               setTimeout(() => {
                 this.ink.goto.goto(results, {

lib/runtime/workspace.coffee

@@ -41,7 +41,6 @@ module.exports =
       mod = if @mod == modules.follow then modules.current() else (@mod or 'Main')
       gotoSymbol
         word: name,
-        fullWord: name,
         mod: mod
       .then (symbols) =>
         return if symbols.error

lib/ui/docs.js

@@ -69,7 +69,6 @@ export function processItem (item) {
   item.onClickName = () => {
     gotoSymbol({
       word: item.name,
-      fullWord: item.name,
       mod: item.mod
     }).then(symbols => {
       if (symbols.error) return