Handling invalid search characters in word mode

jaredpar · Oct 19, 2017 · fe875fb · fe875fb
1 parent fc191ea
commit fe875fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/EasyMotion/IEasyMotionUtil.cs b/EasyMotion/IEasyMotionUtil.cs
@@ -79,6 +79,8 @@ internal interface IEasyMotionUtil
         void ChangeToLookingForDecision(char target);
 
         void ChangeToLookingCharNotFound();
+
+        bool IsInWordMode { get; }
     }
 
     internal interface IEasyMotionUtilProvider

diff --git a/EasyMotion/Implementation/Adornment/EasyMotionAdornmentController.cs b/EasyMotion/Implementation/Adornment/EasyMotionAdornmentController.cs
@@ -109,13 +109,17 @@ private void AddAdornments()
             var snapshot = startPoint.Snapshot;
             int navigateIndex = 0;
 
+            if (_easyMotionUtil.IsInWordMode && !char.IsLetterOrDigit(_easyMotionUtil.TargetChar))
+            {
+                _easyMotionUtil.ChangeToLookingCharNotFound();
+                return;
+            }
             var toSearch = _easyMotionUtil.TargetChar.ToString();
             var data = new FindData()
             {
-                SearchString = _easyMotionUtil.SearchMode ==  EasyMotionSearchMode.Char || _easyMotionUtil.SearchMode == EasyMotionSearchMode.CharExtend
-                ? toSearch :  @"\b" + toSearch,
+                SearchString = _easyMotionUtil.IsInWordMode ? @"\b" + toSearch : toSearch,
                 TextSnapshotToSearch = snapshot,
-                FindOptions = FindOptions.UseRegularExpressions 
+                FindOptions = _easyMotionUtil.IsInWordMode ? FindOptions.UseRegularExpressions : FindOptions.None
             };
 
             var startindex = startPoint.Position;

diff --git a/EasyMotion/Implementation/EasyMotionUtil/EasyMotionUtil.cs b/EasyMotion/Implementation/EasyMotionUtil/EasyMotionUtil.cs
@@ -34,6 +34,8 @@ public ITextView TextView
             get { return _textView; }
         }
 
+        public bool IsInWordMode => SearchMode == EasyMotionSearchMode.Word || SearchMode == EasyMotionSearchMode.WordExtend;
+
         public event EventHandler StateChanged;
 
         internal EasyMotionUtil(ITextView textView)