diff options
| author | Tom Tromey | 2017-02-11 08:43:33 -0700 |
|---|---|---|
| committer | Tom Tromey | 2017-02-11 08:43:47 -0700 |
| commit | c2e19a73401eb37d5c13f6c8589dc1e5d706d239 (patch) | |
| tree | f76e186df66e972f802f6aa2aa75729cea6da028 | |
| parent | ac83b2dfe4504babfbafc5efb37dbde4bed34fed (diff) | |
| download | emacs-c2e19a73401eb37d5c13f6c8589dc1e5d706d239.tar.gz emacs-c2e19a73401eb37d5c13f6c8589dc1e5d706d239.zip | |
Fix bug in css--mdn-find-symbol
* lisp/textmodes/css-mode.el (css--mdn-find-symbol): Skip whitespace
before skipping word characters.
test/lisp/textmodes/css-mode-tests.el (css-mdn-symbol-guessing): Add
regression test.
| -rw-r--r-- | lisp/textmodes/css-mode.el | 6 | ||||
| -rw-r--r-- | test/lisp/textmodes/css-mode-tests.el | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 19746c68e6a..cd86db639ab 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -1190,8 +1190,10 @@ to look up will be substituted there." | |||
| 1190 | "A helper for `css-lookup-symbol' that finds the symbol at point. | 1190 | "A helper for `css-lookup-symbol' that finds the symbol at point. |
| 1191 | Returns the symbol, a string, or nil if none found." | 1191 | Returns the symbol, a string, or nil if none found." |
| 1192 | (save-excursion | 1192 | (save-excursion |
| 1193 | ;; Skip backward over a word first. | 1193 | ;; Skip any whitespace between the word and point. |
| 1194 | (skip-chars-backward "-[:alnum:] \t") | 1194 | (skip-chars-backward "- \t") |
| 1195 | ;; Skip backward over a word. | ||
| 1196 | (skip-chars-backward "-[:alnum:]") | ||
| 1195 | ;; Now skip ":" or "@" to see if it's a pseudo-element or at-id. | 1197 | ;; Now skip ":" or "@" to see if it's a pseudo-element or at-id. |
| 1196 | (skip-chars-backward "@:") | 1198 | (skip-chars-backward "@:") |
| 1197 | (if (looking-at css--mdn-symbol-regexp) | 1199 | (if (looking-at css--mdn-symbol-regexp) |
diff --git a/test/lisp/textmodes/css-mode-tests.el b/test/lisp/textmodes/css-mode-tests.el index 5372c37a179..d601f43002a 100644 --- a/test/lisp/textmodes/css-mode-tests.el +++ b/test/lisp/textmodes/css-mode-tests.el | |||
| @@ -226,7 +226,8 @@ | |||
| 226 | ("a:v" "isited" ":visited") | 226 | ("a:v" "isited" ":visited") |
| 227 | ("border-" "color: red" "border-color") | 227 | ("border-" "color: red" "border-color") |
| 228 | ("border-color: red" ";" "border-color") | 228 | ("border-color: red" ";" "border-color") |
| 229 | ("border-color: red; color: green" ";" "color"))) | 229 | ("border-color: red; color: green" ";" "color") |
| 230 | (" border-collapse " ": collapse;" "border-collapse"))) | ||
| 230 | (with-temp-buffer | 231 | (with-temp-buffer |
| 231 | (css-mode) | 232 | (css-mode) |
| 232 | (insert (nth 0 item)) | 233 | (insert (nth 0 item)) |