Fix WORDS_STARTING mode

cf. #13
leny · May 27, 2016 · a8e4dec · a8e4dec
1 parent b336885
commit a8e4dec
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/views/input.js b/lib/views/input.js
@@ -273,7 +273,7 @@ class InputView extends View {
                 rPositionRegExp = this.createLetterRegExp( this.sLetter );
                 break;
             case InputView.MODE_WORDS_STARTING:
-                rPositionRegExp = this.wordRegExp( this.sLetter );
+                rPositionRegExp = this.startingLetterWordRegExp( this.sLetter );
                 break;
             case InputView.MODE_WORDS:
             default:
@@ -344,10 +344,16 @@ class InputView extends View {
         return iRow === 0 || !this.oRefTextEditor.isFoldedAtBufferRow( iRow ) || !this.oRefTextEditor.isFoldedAtBufferRow( iRow - 1 );
     }
 
-    wordRegExp( sStartingLetter = "" ) {
+    wordRegExp() {
         let sNonWordCharacters = atom.config.get( "editor.nonWordCharacters" );
 
-        return new RegExp( `[${ sStartingLetter ? "" : "^" }\\s${ _.escapeRegExp( sNonWordCharacters ) }]+${ sStartingLetter }`, "gi" );
+        return new RegExp( `[^\\s${ _.escapeRegExp( sNonWordCharacters ) }]+`, "gi" );
+    }
+
+    startingLetterWordRegExp( sStartingLetter ) {
+        let sNonWordCharacters = atom.config.get( "editor.nonWordCharacters" );
+
+        return new RegExp( `(?:^${ sStartingLetter }|[\\s${ _.escapeRegExp( sNonWordCharacters ) }]+${ sStartingLetter })`, "gi" );
     }
 }