procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not tokenize a comment before continuation as ';'

Browse source 
* lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p):
Account for a comment right after point.
This commit is contained in:
Dmitry Gutov 2016-03-15 03:15:18 +02:00
parent 040362001d
commit dbfbedd3d0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/progmodes/ruby-mode.el
View file

@ -443,7 +443,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
(member (save-excursion (ruby-smie--backward-token)) (member (save-excursion (ruby-smie--backward-token))
'("iuwu-mod" "and" "or"))) '("iuwu-mod" "and" "or")))
(save-excursion (save-excursion
(forward-comment 1) (forward-comment (point-max))
(looking-at "&?\\.")))))) (looking-at "&?\\."))))))
(defun ruby-smie--redundant-do-p (&optional skip) (defun ruby-smie--redundant-do-p (&optional skip)

2
test/indent/ruby.rb
View file

@ -222,7 +222,7 @@ def begin
bar bar
# https://github.com/rails/rails/blob/17f5d8e062909f1fcae25351834d8e89967b645e/activesupport/lib/active_support/time_with_zone.rb#L206 # https://github.com/rails/rails/blob/17f5d8e062909f1fcae25351834d8e89967b645e/activesupport/lib/active_support/time_with_zone.rb#L206
foo foo # comment intended to confuse the tokenizer
.bar .bar
z = { z = {