simpler dot striping:

- ref: 
#651 (comment)

Author: aviatesk

lib/misc/words.js

@@ -3,7 +3,6 @@
 import { Point, Range } from 'atom'
 
 export const wordRegex = /[\u00A0-\uFFFF\w_!´\.]*@?[\u00A0-\uFFFF\w_!´]+/
-export const wordRegexWithoutDotAccessor = /@?[\u00A0-\uFFFF\w_!´]+/
 
 /**
  * Takes an `editor` and gets the word at current cursor position. If that is nonempty, call
@@ -17,89 +16,79 @@ export function withWord (editor, fn) {
 }
 
 /**
- * Gets the word and its range in the `editor`
+ * Returns the word and its range in the `editor`.
  *
  * `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”. 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`).
+ * - `wordRegex` {RegExp} : A RegExp indicating what constitutes a “word” (default: `wordRegex`).
  */
 export function getWordAndRange (editor, options = {
   bufferPosition: undefined,
-  wordRegex: wordRegex,
-  beginWordRegex: undefined,
-  endWordRegex: undefined
+  wordRegex: wordRegex
 }) {
   // @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, options) :
-    getWordRangeAtBufferPosition(editor, editor.getLastCursor().getBufferPosition(), options)
+  const bufferPosition = options.bufferPosition ?
+    options.bufferPosition :
+    editor.getLastCursor().getBufferPosition()
+  const range = getWordRangeAtBufferPosition(editor, bufferPosition, {
+    wordRegex: options.wordRegex ? options.wordRegex : wordRegex
+  })
   const word = editor.getTextInBufferRange(range)
   return { word, range }
 }
 
 /**
- * get the word under `bufferPosition` in `editor`
+ * Returns the range of a word containing the `bufferPosition` in `editor`.
  *
  * `options`
- * - `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`).
+ * - `wordRegex` {RegExp}: A RegExp indicating what constitutes a “word” (default: `wordRegex`).
  */
-export function getWordRangeAtBufferPosition(editor, bufferPosition, options = {
-  wordRegex: wordRegex,
-  beginWordRegex: undefined,
-  endWordRegex: undefined,
+export function getWordRangeAtBufferPosition (editor, bufferPosition, options = {
+  wordRegex: wordRegex
 }) {
-  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
+  // 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)
+}
 
-    // 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
+/**
+ * Examples: `|` represents `bufferPosition`:
+ * - `"he|ad.word.foot"` => `Range` of `"head"`
+ * - `"head|.word.foot"` => `Range` of `"head"`
+ * - `"head.|word.foot"` => `Range` of `"head.word"`
+ * - `"head.word.fo|ot"` => `Range` of `"head.word.field"`
+ */
+export function getWordRangeWithoutTrailingDots (word, range, bufferPosition) {
+  const { start } = range
+  const { column: startColumn } = start
+  const { row: endRow } = range.end
+  let endColumn = startColumn
+
+  const { column } = 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)
+  const elements = word.split('.')
+  for (const element of elements) {
+    endColumn += element.length
+    if (column <= endColumn) {
+      break
+    } else {
+      endColumn += 1
+    }
   }
+
+  const end = new Point(endRow, endColumn)
+  return new Range(start, end)
 }
 
 /**

lib/runtime/datatip.js

@@ -12,9 +12,8 @@ import { client } from '../connection'
 import modules from './modules'
 import { isValidScopeToInspect } from '../misc/scopes'
 import {
-  wordRegex,
-  wordRegexWithoutDotAccessor,
   getWordAndRange,
+  getWordRangeWithoutTrailingDots,
   isValidWordToInspect
 } from '../misc/words'
 import { getLocalContext } from '../misc/blocks'
@@ -40,11 +39,11 @@ class DatatipProvider {
     if (!isValidScopeToInspect(editor, bufferPosition)) return
 
     // get word without trailing dot accessors at the buffer position
-    const { range, word } = getWordAndRange(editor, {
-      bufferPosition,
-      beginWordRegex: wordRegex,
-      endWordRegex: wordRegexWithoutDotAccessor,
+    let { range, word } = getWordAndRange(editor, {
+      bufferPosition
     })
+    range = getWordRangeWithoutTrailingDots(word, range, bufferPosition)
+    word = editor.getTextInBufferRange(range)
 
     // check the validity of code to be inspected
     if (!(isValidWordToInspect(word))) return

lib/runtime/evaluation.coffee

@@ -86,10 +86,11 @@ module.exports =
 
   toggleDocs: (word, range) ->
     { editor, mod, edpath } = @_currentContext()
-    { word, range } = words.getWordAndRange(editor,
-      beginWordRegex: words.wordRegex
-      endWordRegex: words.wordRegexWithoutDotAccessor
-    ) unless word? and range?
+    # get word without trailing dot accessors at the buffer position
+    { word, range } = words.getWordAndRange(editor) unless word? and range?
+    range = words.getWordRangeWithoutTrailingDots(word, range, bufferPosition)
+    word = editor.getTextInBufferRange(range)
+
     return unless words.isValidWordToInspect(word)
     searchDoc({word: word, mod: mod}).then (result) =>
       if result.error then return

lib/runtime/goto.js

@@ -8,10 +8,9 @@ import { client } from '../connection'
 import modules from './modules'
 import { isValidScopeToInspect } from '../misc/scopes'
 import {
-  wordRegex,
-  wordRegexWithoutDotAccessor,
   getWordAndRange,
   getWordRangeAtBufferPosition,
+  getWordRangeWithoutTrailingDots,
   isValidWordToInspect
 } from '../misc/words'
 import { getLocalContext } from '../misc/blocks'
@@ -82,11 +81,11 @@ class Goto {
     if (!this.isClientAndInkReady()) return
 
     // get word without trailing dot accessors at the buffer position
-    const { word } = getWordAndRange(editor, {
-      bufferPosition,
-      beginWordRegex: wordRegex,
-      endWordRegex: wordRegexWithoutDotAccessor,
+    let { word, range } = getWordAndRange(editor, {
+      bufferPosition
     })
+    range = getWordRangeWithoutTrailingDots(word, range, bufferPosition)
+    word = editor.getTextInBufferRange(range)
 
     // check the validity of code to be inspected
     if (!(isValidWordToInspect(word))) return
@@ -144,11 +143,11 @@ class Goto {
       if (!isValidScopeToInspect(textEditor, bufferPosition)) return
 
       // get word without trailing dot accessors at the buffer position
-      const { word, range } = getWordAndRange(textEditor, {
-        bufferPosition,
-        beginWordRegex: wordRegex,
-        endWordRegex: wordRegexWithoutDotAccessor,
+      let { word, range } = getWordAndRange(textEditor, {
+        bufferPosition
       })
+      range = getWordRangeWithoutTrailingDots(word, range, bufferPosition)
+      word = textEditor.getTextInBufferRange(range)
 
       // check the validity of code to be inspected
       if (!(isValidWordToInspect(word))) return