* lisp/progmodes/ruby-mode.el (ruby-parse-partial): No error when end

up inside string symbol literal.
* test/automated/ruby-mode-tests.el: New file with one test.

Fixes: debbugs:11923
This commit is contained in:
Dmitry Gutov 2012-07-20 07:10:25 -04:00 committed by Stefan Monnier
parent 87ab808f0c
commit c28662a8dc
4 changed files with 49 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2012-07-20 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-parse-partial): No error when end
up inside string symbol literal (bug#11923).
2012-07-20 Eli Zaretskii <eliz@gnu.org>
* startup.el (fancy-startup-text): Read the whole tutorial, not

View file

@ -594,7 +594,7 @@ and `\\' when preceded by `?'."
(goto-char pnt))
((looking-at ":\\(['\"]\\)")
(goto-char (match-beginning 1))
(ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end))
(ruby-forward-string (match-string 1) end t))
((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\|![~=]?\\)")
(goto-char (match-end 0)))
((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")

View file

@ -1,3 +1,7 @@
2012-07-20 Dmitry Gutov <dgutov@yandex.ru>
* automated/ruby-mode-tests.el: New file with one test.
2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
* indent/shell.sh: Add test case for ${#VAR}.

View file

@ -0,0 +1,39 @@
;;; ruby-mode-tests.el --- Test suite for ruby-mode
;; Copyright (C) 2012 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
(require 'ruby-mode)
(ert-deftest indent-line-after-symbol-made-from-string-interpolation ()
"It can indent the line after symbol made using string interpolation."
(let ((initial-content "def foo(suffix)\n :\"bar#{suffix}\"\n")
(expected-content "def foo(suffix)\n :\"bar#{suffix}\"\n "))
(with-temp-buffer
(insert initial-content)
(ruby-indent-line) ; Doesn't rely on text properties or the syntax table.
(let ((buffer-content (buffer-substring-no-properties (point-min)
(point-max))))
(should (string= buffer-content expected-content))))))
(provide 'ruby-mode-tests)
;;; ruby-mode-tests.el ends here