aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDmitry Gutov2013-10-06 03:46:28 +0300
committerDmitry Gutov2013-10-06 03:46:28 +0300
commit5cd9cda9b61159051825a2c5ae2700bf280e2cf2 (patch)
tree1599c8a62f4ade9f210af9857dabc7bdcdc126f2 /test
parentda9ea6d9803d6a12f93ed7b2effd85e254b390e8 (diff)
downloademacs-5cd9cda9b61159051825a2c5ae2700bf280e2cf2.tar.gz
emacs-5cd9cda9b61159051825a2c5ae2700bf280e2cf2.zip
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
keyword, too. * test/indent/ruby.rb: Fix a syntax error, add a few failing examples.
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog4
-rw-r--r--test/indent/ruby.rb23
2 files changed, 26 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index ac98b1c3040..bc9addb810b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
12013-10-06 Dmitry Gutov <dgutov@yandex.ru>
2
3 * indent/ruby.rb: Fix a syntax error, add a few failing examples.
4
12013-10-05 Stefan Monnier <monnier@iro.umontreal.ca> 52013-10-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el. 7 * indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el.
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 15315bcf653..d52f4a3e6f6 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -37,7 +37,7 @@ foo = [1, # ruby-deep-indent
37 2] 37 2]
38 38
39foo = { # ruby-deep-indent-disabled 39foo = { # ruby-deep-indent-disabled
40 a : b 40 a: b
41} 41}
42 42
43foo = [ # ruby-deep-indent-disabled 43foo = [ # ruby-deep-indent-disabled
@@ -99,6 +99,27 @@ if something == :==
99 do_something 99 do_something
100end 100end
101 101
102begin
103 foo
104ensure
105 bar
106end
107
108# Examples below fail with SMIE.
109
102# Bug#15369 110# Bug#15369
103MSG = 'Separate every 3 digits in the integer portion of a number' \ 111MSG = 'Separate every 3 digits in the integer portion of a number' \
104 'with underscores(_).' 112 'with underscores(_).'
113
114# Next two fail similarly to the one above, so maybe remove 1 or 2
115# after they're fixed:
116
117a = foo(j, k) -
118 bar_tee
119
120while a < b do # "do" is optional
121 foo
122end
123
124desc "foo foo" \
125 "bar bar"