Extract SymbolHelpers file

Gert-dev · Oct 18, 2017 · 241328a · 241328a
1 parent a0b4bef
commit 241328a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/lib/GotoDefinitionProvider.coffee b/lib/GotoDefinitionProvider.coffee
@@ -1,6 +1,4 @@
-{Range} = require 'atom'
-
-LanguageClientUtils = require '../node_modules/atom-languageclient/build/lib/utils'
+SymbolHelpers = require './SymbolHelpers'
 
 module.exports =
 
@@ -30,7 +28,7 @@ class GotoDefinitionProvider
             return null if not result?
 
             return {
-                range : @getRangeForSymbolAtPosition(editor, bufferPosition)
+                range : SymbolHelpers.getRangeForSymbolAtPosition(editor, bufferPosition)
 
                 callback : () =>
                     atom.workspace.open(result.uri, {
@@ -43,32 +41,3 @@ class GotoDefinitionProvider
             return null
 
         return @service.gotoDefinitionAt(editor, bufferPosition).then(successHandler, failureHandler)
-
-    ###*
-     * Slightly modified variant of the LanguageClientUtils getWordAtPosition.
-     *
-     * This variant does not treat the backslash as a non-word character, so it is not treated as boundary and the range
-     * does not stop when it is found. This is important for qualified names in PHP (i.e. imports, qualified function
-     * calls, ...).
-     *
-     * @param {TextEditor} editor
-     * @param {Point}      position
-     *
-     * @see https://github.com/atom/atom-languageclient/blob/master/lib/utils.js
-    ###
-    getRangeForSymbolAtPosition: (editor, position) ->
-        scopeDescriptor = editor.scopeDescriptorForBufferPosition(position)
-        nonWordCharacters = editor.getNonWordCharacters(scopeDescriptor)
-        nonWordCharacters = nonWordCharacters.replace("\\", '')
-        nonWordCharacters = LanguageClientUtils.escapeRegExp(nonWordCharacters)
-
-        range = LanguageClientUtils._getRegexpRangeAtPosition(
-            editor.getBuffer(),
-            position,
-            ///^[\t ]*$|[^\s#{nonWordCharacters}]+///g
-        )
-
-        if range == null
-            return new Range(position, position);
-
-        return range
diff --git a/lib/SymbolHelpers.coffee b/lib/SymbolHelpers.coffee
@@ -0,0 +1,33 @@
+{Range} = require 'atom'
+
+LanguageClientUtils = require '../node_modules/atom-languageclient/build/lib/utils'
+
+module.exports =
+    ###*
+     * Slightly modified variant of the LanguageClientUtils getWordAtPosition.
+     *
+     * This variant does not treat the backslash as a non-word character, so it is not treated as boundary and the range
+     * does not stop when it is found. This is important for qualified names in PHP (i.e. imports, qualified function
+     * calls, ...).
+     *
+     * @param {TextEditor} editor
+     * @param {Point}      position
+     *
+     * @see https://github.com/atom/atom-languageclient/blob/master/lib/utils.js
+    ###
+    getRangeForSymbolAtPosition: (editor, position) ->
+        scopeDescriptor = editor.scopeDescriptorForBufferPosition(position)
+        nonWordCharacters = editor.getNonWordCharacters(scopeDescriptor)
+        nonWordCharacters = nonWordCharacters.replace("\\", '')
+        nonWordCharacters = LanguageClientUtils.escapeRegExp(nonWordCharacters)
+
+        range = LanguageClientUtils._getRegexpRangeAtPosition(
+            editor.getBuffer(),
+            position,
+            ///^[\t ]*$|[^\s#{nonWordCharacters}]+///g
+        )
+
+        if range == null
+            return new Range(position, position);
+
+        return range