Do not decide if in a string or symbol by checking the face.

rejeep · Apr 6, 2012 · 9d52cf7 · 9d52cf7
1 parent a980c4b
commit 9d52cf7
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/ruby-tools.el b/ruby-tools.el
@@ -103,19 +103,14 @@
   "Check if cursor is at a symbol or not."
   (and
    (not (ruby-tools-string-at-point-p))
-   (or
+   (looking-at "[A-Za-z0-9_]+")
-    (memq 'font-lock-constant-face (text-properties-at (point)))
+   (looking-back ":[A-Za-z0-9_]*")))
-    (and
-     (looking-at "[A-Za-z0-9_]+")
-     (looking-back ":[A-Za-z0-9_]*")))))
 
 (defun ruby-tools-string-at-point-p ()
   "Check if cursor is at a string or not."
-  (or
+  (and
-   (memq 'font-lock-string-face (text-properties-at (point)))
+   (looking-at "[^\"']+['\"]")
-   (and
+   (looking-back "['\"][^\"']*")))
-    (looking-at "[^\"']+['\"]")
-    (looking-back "['\"][^\"']*"))))
 
 (defun ruby-tools-symbol-region ()
   (list