diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-02-01 16:54:58 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-02-01 16:54:58 +0200 |
| commit | a09beb3df21677b0797e27cb75bd5c66226f6bc9 (patch) | |
| tree | 305bfdfe3f0ff259d3215d1f3e40db20f6919a08 | |
| parent | 9ef58a52ac97a160e2818e69e7cd146e52fbdacf (diff) | |
| download | emacs-a09beb3df21677b0797e27cb75bd5c66226f6bc9.tar.gz | |
Fix bug#16609
* lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Check for
`:' before binary operators. Don't check for `:'
before `[' and `(', or their syntax status. A percent literal
can't end with either.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 7 | ||||
| -rw-r--r-- | test/indent/ruby.rb | 7 |
3 files changed, 19 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 91b9aff1dba..4903bfdd1d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-02-01 Dmitry Gutov <dgutov@yandex.ru> + + * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Check for + `:' before binary operators (bug#16609). Don't check for `:' + before `[' and `(', or their syntax status. A percent literal + can't end with either. + 2014-02-01 Lars Ingebrigtsen <larsi@gnus.org> * subr.el (butlast): Document what an omitted N means (bug#13437). diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 1bce911cf0e..5cee77b29a5 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -422,14 +422,17 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'." (save-excursion (skip-chars-backward " \t") (not (or (bolp) + (memq (char-before) '(?\[ ?\()) (and (memq (char-before) - '(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\[ ?\( ?\\ ?& ?> ?< ?% - ?~ ?^)) + '(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\\ ?& ?> ?< ?% ?~ ?^)) + ;; Not a binary operator symbol. + (not (eq (char-before (1- (point))) ?:)) ;; Not the end of a regexp or a percent literal. (not (memq (car (syntax-after (1- (point)))) '(7 15)))) (and (eq (char-before) ?\?) (equal (save-excursion (ruby-smie--backward-token)) "?")) (and (eq (char-before) ?=) + ;; Not a symbol :==, :!=, or a foo= method. (string-match "\\`\\s." (save-excursion (ruby-smie--backward-token)))) (and (eq (char-before) ?|) diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb index 49ed92f8fdc..cf6bcba8c39 100644 --- a/test/indent/ruby.rb +++ b/test/indent/ruby.rb @@ -135,6 +135,13 @@ end # Bug#15208 if something == :== do_something + + return false unless method == :+ + x = y + z # Bug#16609 + + a = 1 ? 2 :( + 2 + 3 + ) end # Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html |