2012-07-20 07:10:25 -04:00
|
|
|
;;; ruby-mode-tests.el --- Test suite for ruby-mode
|
|
|
|
|
2015-01-01 14:26:41 -08:00
|
|
|
;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
|
2012-07-20 07:10:25 -04:00
|
|
|
|
|
|
|
;; 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:
|
|
|
|
|
2013-07-09 00:11:50 -07:00
|
|
|
(require 'ert)
|
2012-07-20 07:10:25 -04:00
|
|
|
(require 'ruby-mode)
|
|
|
|
|
2013-10-10 17:43:47 -04:00
|
|
|
(defmacro ruby-with-temp-buffer (contents &rest body)
|
|
|
|
(declare (indent 1) (debug t))
|
|
|
|
`(with-temp-buffer
|
|
|
|
(insert ,contents)
|
|
|
|
(ruby-mode)
|
|
|
|
,@body))
|
|
|
|
|
2012-08-10 16:19:09 -04:00
|
|
|
(defun ruby-should-indent (content column)
|
2012-08-10 16:25:43 -04:00
|
|
|
"Assert indentation COLUMN on the last line of CONTENT."
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer content
|
2013-10-10 17:43:47 -04:00
|
|
|
(indent-according-to-mode)
|
2012-08-10 16:25:43 -04:00
|
|
|
(should (= (current-indentation) column))))
|
|
|
|
|
|
|
|
(defun ruby-should-indent-buffer (expected content)
|
|
|
|
"Assert that CONTENT turns into EXPECTED after the buffer is re-indented.
|
|
|
|
|
|
|
|
The whitespace before and including \"|\" on each line is removed."
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer (ruby-test-string content)
|
2012-11-13 13:30:16 +04:00
|
|
|
(indent-region (point-min) (point-max))
|
|
|
|
(should (string= (ruby-test-string expected) (buffer-string)))))
|
|
|
|
|
|
|
|
(defun ruby-test-string (s &rest args)
|
|
|
|
(apply 'format (replace-regexp-in-string "^[ \t]*|" "" s) args))
|
2012-08-10 16:19:09 -04:00
|
|
|
|
2013-03-06 22:56:29 +04:00
|
|
|
(defun ruby-assert-state (content index value &optional point)
|
2012-08-10 16:19:09 -04:00
|
|
|
"Assert syntax state values at the end of CONTENT.
|
|
|
|
|
|
|
|
VALUES-PLIST is a list with alternating index and value elements."
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer content
|
2013-03-06 22:56:29 +04:00
|
|
|
(when point (goto-char point))
|
2012-08-10 16:19:09 -04:00
|
|
|
(syntax-propertize (point))
|
2013-03-06 22:56:29 +04:00
|
|
|
(should (eq (nth index
|
|
|
|
(parse-partial-sexp (point-min) (point)))
|
|
|
|
value))))
|
2012-08-10 16:19:09 -04:00
|
|
|
|
2012-09-07 08:15:56 +04:00
|
|
|
(defun ruby-assert-face (content pos face)
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer content
|
2014-05-28 22:55:57 -07:00
|
|
|
(font-lock-ensure nil nil)
|
2012-09-07 08:15:56 +04:00
|
|
|
(should (eq face (get-text-property pos 'face)))))
|
|
|
|
|
2012-08-10 16:19:09 -04:00
|
|
|
(ert-deftest ruby-indent-after-symbol-made-from-string-interpolation ()
|
2012-07-20 07:10:25 -04:00
|
|
|
"It can indent the line after symbol made using string interpolation."
|
2012-08-10 16:19:09 -04:00
|
|
|
(ruby-should-indent "def foo(suffix)\n :\"bar#{suffix}\"\n"
|
|
|
|
ruby-indent-level))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-after-js-style-symbol-with-block-beg-name ()
|
|
|
|
"JS-style hash symbol can have keyword name."
|
|
|
|
(ruby-should-indent "link_to \"home\", home_path, class: \"foo\"\n" 0))
|
|
|
|
|
|
|
|
(ert-deftest ruby-discern-singleton-class-from-heredoc ()
|
|
|
|
(ruby-assert-state "foo <<asd\n" 3 ?\n)
|
|
|
|
(ruby-assert-state "class <<asd\n" 3 nil))
|
2012-07-20 07:10:25 -04:00
|
|
|
|
2012-11-13 07:07:09 +04:00
|
|
|
(ert-deftest ruby-heredoc-font-lock ()
|
|
|
|
(let ((s "foo <<eos.gsub('^ *', '')"))
|
2012-11-14 16:17:21 +04:00
|
|
|
(ruby-assert-face s 9 font-lock-string-face)
|
2012-11-13 07:07:09 +04:00
|
|
|
(ruby-assert-face s 10 nil)))
|
|
|
|
|
|
|
|
(ert-deftest ruby-singleton-class-no-heredoc-font-lock ()
|
|
|
|
(ruby-assert-face "class<<a" 8 nil))
|
|
|
|
|
2013-05-19 10:01:23 +04:00
|
|
|
(ert-deftest ruby-heredoc-highlights-interpolations ()
|
|
|
|
(ruby-assert-face "s = <<EOS\n #{foo}\nEOS" 15 font-lock-variable-name-face))
|
|
|
|
|
2013-06-30 06:23:10 +04:00
|
|
|
(ert-deftest ruby-no-heredoc-inside-quotes ()
|
|
|
|
(ruby-assert-state "\"<<\", \"\",\nfoo" 3 nil))
|
|
|
|
|
2013-12-06 06:22:08 +02:00
|
|
|
(ert-deftest ruby-exit!-font-lock ()
|
2013-11-20 13:01:31 +02:00
|
|
|
(ruby-assert-face "exit!" 5 font-lock-builtin-face))
|
|
|
|
|
2012-08-10 16:25:43 -04:00
|
|
|
(ert-deftest ruby-deep-indent ()
|
|
|
|
(let ((ruby-deep-arglist nil)
|
|
|
|
(ruby-deep-indent-paren '(?\( ?\{ ?\[ ?\] t)))
|
|
|
|
(ruby-should-indent "foo = [1,\n2" 7)
|
|
|
|
(ruby-should-indent "foo = {a: b,\nc: d" 7)
|
|
|
|
(ruby-should-indent "foo(a,\nb" 4)))
|
|
|
|
|
|
|
|
(ert-deftest ruby-deep-indent-disabled ()
|
|
|
|
(let ((ruby-deep-arglist nil)
|
|
|
|
(ruby-deep-indent-paren nil))
|
|
|
|
(ruby-should-indent "foo = [\n1" ruby-indent-level)
|
|
|
|
(ruby-should-indent "foo = {\na: b" ruby-indent-level)
|
|
|
|
(ruby-should-indent "foo(\na" ruby-indent-level)))
|
|
|
|
|
2012-09-07 08:15:56 +04:00
|
|
|
(ert-deftest ruby-indent-after-keyword-in-a-string ()
|
|
|
|
(ruby-should-indent "a = \"abc\nif\"\n " 0)
|
|
|
|
(ruby-should-indent "a = %w[abc\n def]\n " 0)
|
|
|
|
(ruby-should-indent "a = \"abc\n def\"\n " 0))
|
|
|
|
|
2013-03-10 21:07:45 -07:00
|
|
|
(ert-deftest ruby-regexp-doesnt-start-in-string ()
|
2013-03-06 22:56:29 +04:00
|
|
|
(ruby-assert-state "'(/', /\d+/" 3 nil))
|
|
|
|
|
|
|
|
(ert-deftest ruby-regexp-starts-after-string ()
|
|
|
|
(ruby-assert-state "'(/', /\d+/" 3 ?/ 8))
|
|
|
|
|
2013-05-31 20:55:03 +04:00
|
|
|
(ert-deftest ruby-regexp-interpolation-is-highlighted ()
|
|
|
|
(ruby-assert-face "/#{foobs}/" 4 font-lock-variable-name-face))
|
|
|
|
|
2013-05-19 10:01:23 +04:00
|
|
|
(ert-deftest ruby-regexp-skips-over-interpolation ()
|
|
|
|
(ruby-assert-state "/#{foobs.join('/')}/" 3 nil))
|
|
|
|
|
|
|
|
(ert-deftest ruby-regexp-continues-till-end-when-unclosed ()
|
|
|
|
(ruby-assert-state "/bars" 3 ?/))
|
|
|
|
|
|
|
|
(ert-deftest ruby-regexp-can-be-multiline ()
|
|
|
|
(ruby-assert-state "/bars\ntees # toots \nfoos/" 3 nil))
|
|
|
|
|
2013-06-19 02:17:56 +04:00
|
|
|
(ert-deftest ruby-slash-symbol-is-not-mistaken-for-regexp ()
|
|
|
|
(ruby-assert-state ":/" 3 nil))
|
|
|
|
|
|
|
|
(ert-deftest ruby-slash-char-literal-is-not-mistaken-for-regexp ()
|
|
|
|
(ruby-assert-state "?/" 3 nil))
|
|
|
|
|
2012-08-10 16:25:43 -04:00
|
|
|
(ert-deftest ruby-indent-simple ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"if foo
|
|
|
|
| bar
|
|
|
|
|end
|
|
|
|
|zot
|
|
|
|
|"
|
|
|
|
"if foo
|
|
|
|
|bar
|
|
|
|
| end
|
|
|
|
| zot
|
|
|
|
|"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-keyword-label ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"bar(class: XXX) do
|
|
|
|
| foo
|
|
|
|
|end
|
|
|
|
|bar
|
|
|
|
|"
|
|
|
|
"bar(class: XXX) do
|
|
|
|
| foo
|
|
|
|
| end
|
|
|
|
| bar
|
|
|
|
|"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-method-with-question-mark ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"if x.is_a?(XXX)
|
|
|
|
| foo
|
|
|
|
|end
|
|
|
|
|"
|
|
|
|
"if x.is_a?(XXX)
|
|
|
|
| foo
|
|
|
|
| end
|
|
|
|
|"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-expr-in-regexp ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"if /#{foo}/ =~ s
|
|
|
|
| x = 1
|
|
|
|
|end
|
|
|
|
|"
|
|
|
|
"if /#{foo}/ =~ s
|
|
|
|
| x = 1
|
|
|
|
| end
|
|
|
|
|"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-singleton-class ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"class<<bar
|
|
|
|
| foo
|
|
|
|
|end
|
|
|
|
|"
|
|
|
|
"class<<bar
|
|
|
|
|foo
|
|
|
|
| end
|
|
|
|
|"))
|
|
|
|
|
2012-11-14 10:34:17 +04:00
|
|
|
(ert-deftest ruby-indent-inside-heredoc-after-operator ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"b=<<eos
|
|
|
|
| 42"
|
|
|
|
"b=<<eos
|
|
|
|
| 42"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-inside-heredoc-after-space ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"foo <<eos.gsub(' ', '*')
|
|
|
|
| 42"
|
|
|
|
"foo <<eos.gsub(' ', '*')
|
|
|
|
| 42"))
|
|
|
|
|
2012-08-10 16:25:43 -04:00
|
|
|
(ert-deftest ruby-indent-array-literal ()
|
|
|
|
(let ((ruby-deep-indent-paren nil))
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"foo = [
|
|
|
|
| bar
|
|
|
|
|]
|
|
|
|
|"
|
|
|
|
"foo = [
|
|
|
|
| bar
|
|
|
|
| ]
|
|
|
|
|"))
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"foo do
|
|
|
|
| [bar]
|
|
|
|
|end
|
|
|
|
|"
|
|
|
|
"foo do
|
|
|
|
|[bar]
|
|
|
|
| end
|
|
|
|
|"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-begin-end ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"begin
|
|
|
|
| a[b]
|
|
|
|
|end
|
|
|
|
|"
|
|
|
|
"begin
|
|
|
|
| a[b]
|
|
|
|
| end
|
|
|
|
|"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-indent-array-after-paren-and-space ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"class A
|
|
|
|
| def foo
|
|
|
|
| foo( [])
|
|
|
|
| end
|
|
|
|
|end
|
|
|
|
|"
|
|
|
|
"class A
|
|
|
|
| def foo
|
|
|
|
|foo( [])
|
|
|
|
|end
|
|
|
|
| end
|
|
|
|
|"))
|
|
|
|
|
2012-12-26 20:45:19 +04:00
|
|
|
(ert-deftest ruby-indent-after-block-in-continued-expression ()
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"var =
|
|
|
|
| begin
|
|
|
|
| val
|
|
|
|
| end
|
|
|
|
|statement"
|
|
|
|
"var =
|
|
|
|
|begin
|
|
|
|
|val
|
|
|
|
|end
|
|
|
|
|statement"))
|
|
|
|
|
2013-01-28 02:47:34 +04:00
|
|
|
(ert-deftest ruby-indent-spread-args-in-parens ()
|
|
|
|
(let ((ruby-deep-indent-paren '(?\()))
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"foo(1,
|
|
|
|
| 2,
|
|
|
|
| 3)
|
|
|
|
|"
|
|
|
|
"foo(1,
|
|
|
|
| 2,
|
|
|
|
| 3)
|
|
|
|
|")))
|
|
|
|
|
2013-12-20 07:20:33 +02:00
|
|
|
(ert-deftest ruby-align-to-stmt-keywords-t ()
|
|
|
|
(let ((ruby-align-to-stmt-keywords t))
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"foo = if bar?
|
|
|
|
| 1
|
|
|
|
|else
|
|
|
|
| 2
|
|
|
|
|end
|
|
|
|
|
|
|
|
|
|foo || begin
|
|
|
|
| bar
|
|
|
|
|end
|
|
|
|
|
|
|
|
|
|foo ||
|
|
|
|
| begin
|
|
|
|
| bar
|
|
|
|
| end
|
|
|
|
|"
|
|
|
|
"foo = if bar?
|
|
|
|
| 1
|
|
|
|
|else
|
|
|
|
| 2
|
|
|
|
| end
|
|
|
|
|
|
|
|
|
| foo || begin
|
|
|
|
| bar
|
|
|
|
|end
|
|
|
|
|
|
|
|
|
| foo ||
|
|
|
|
| begin
|
|
|
|
|bar
|
|
|
|
| end
|
|
|
|
|")
|
|
|
|
))
|
|
|
|
|
|
|
|
(ert-deftest ruby-align-to-stmt-keywords-case ()
|
|
|
|
(let ((ruby-align-to-stmt-keywords '(case)))
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"b = case a
|
|
|
|
|when 13
|
|
|
|
| 6
|
|
|
|
|else
|
|
|
|
| 42
|
|
|
|
|end"
|
|
|
|
"b = case a
|
|
|
|
| when 13
|
|
|
|
| 6
|
|
|
|
| else
|
|
|
|
| 42
|
|
|
|
| end")))
|
|
|
|
|
2014-01-31 19:13:49 +02:00
|
|
|
(ert-deftest ruby-align-chained-calls ()
|
|
|
|
(let ((ruby-align-chained-calls t))
|
|
|
|
(ruby-should-indent-buffer
|
|
|
|
"one.two.three
|
|
|
|
| .four
|
|
|
|
|
|
|
|
|
|my_array.select { |str| str.size > 5 }
|
|
|
|
| .map { |str| str.downcase }"
|
|
|
|
"one.two.three
|
|
|
|
| .four
|
|
|
|
|
|
|
|
|
|my_array.select { |str| str.size > 5 }
|
|
|
|
| .map { |str| str.downcase }")))
|
|
|
|
|
2012-11-12 05:11:06 +04:00
|
|
|
(ert-deftest ruby-move-to-block-stops-at-indentation ()
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer "def f\nend"
|
2012-08-12 18:06:56 -04:00
|
|
|
(beginning-of-line)
|
|
|
|
(ruby-move-to-block -1)
|
2012-11-12 05:11:06 +04:00
|
|
|
(should (looking-at "^def"))))
|
2012-08-12 18:06:56 -04:00
|
|
|
|
|
|
|
(ert-deftest ruby-toggle-block-to-do-end ()
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer "foo {|b|\n}"
|
2012-09-09 03:32:25 +04:00
|
|
|
(beginning-of-line)
|
2012-08-12 18:06:56 -04:00
|
|
|
(ruby-toggle-block)
|
2012-09-09 03:32:25 +04:00
|
|
|
(should (string= "foo do |b|\nend" (buffer-string)))))
|
2012-08-12 18:06:56 -04:00
|
|
|
|
|
|
|
(ert-deftest ruby-toggle-block-to-brace ()
|
2013-10-26 05:16:37 +04:00
|
|
|
(let ((pairs '((17 . "foo { |b| b + 2 }")
|
|
|
|
(16 . "foo { |b|\n b + 2\n}"))))
|
2012-09-19 02:10:19 +04:00
|
|
|
(dolist (pair pairs)
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((fill-column (car pair)))
|
|
|
|
(insert "foo do |b|\n b + 2\nend")
|
|
|
|
(ruby-mode)
|
|
|
|
(beginning-of-line)
|
|
|
|
(ruby-toggle-block)
|
|
|
|
(should (string= (cdr pair) (buffer-string))))))))
|
2012-09-09 03:32:25 +04:00
|
|
|
|
|
|
|
(ert-deftest ruby-toggle-block-to-multiline ()
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer "foo {|b| b + 1}"
|
2012-09-09 03:32:25 +04:00
|
|
|
(beginning-of-line)
|
2012-08-12 18:06:56 -04:00
|
|
|
(ruby-toggle-block)
|
2012-09-09 03:32:25 +04:00
|
|
|
(should (string= "foo do |b|\n b + 1\nend" (buffer-string)))))
|
2012-08-12 18:06:56 -04:00
|
|
|
|
2013-11-17 23:39:13 +02:00
|
|
|
(ert-deftest ruby-toggle-block-with-interpolation ()
|
|
|
|
(ruby-with-temp-buffer "foo do\n \"#{bar}\"\nend"
|
|
|
|
(beginning-of-line)
|
|
|
|
(ruby-toggle-block)
|
|
|
|
(should (string= "foo { \"#{bar}\" }" (buffer-string)))))
|
|
|
|
|
2012-09-07 08:15:56 +04:00
|
|
|
(ert-deftest ruby-recognize-symbols-starting-with-at-character ()
|
2012-11-14 16:17:21 +04:00
|
|
|
(ruby-assert-face ":@abc" 3 font-lock-constant-face))
|
2012-09-07 08:15:56 +04:00
|
|
|
|
|
|
|
(ert-deftest ruby-hash-character-not-interpolation ()
|
|
|
|
(ruby-assert-face "\"This is #{interpolation}\"" 15
|
2012-11-14 16:17:21 +04:00
|
|
|
font-lock-variable-name-face)
|
2012-09-07 08:15:56 +04:00
|
|
|
(ruby-assert-face "\"This is \\#{no interpolation} despite the #\""
|
2012-11-14 16:17:21 +04:00
|
|
|
15 font-lock-string-face)
|
|
|
|
(ruby-assert-face "\n#@comment, not ruby code" 5 font-lock-comment-face)
|
2012-09-08 19:13:14 +04:00
|
|
|
(ruby-assert-state "\n#@comment, not ruby code" 4 t)
|
2012-09-07 08:15:56 +04:00
|
|
|
(ruby-assert-face "# A comment cannot have #{an interpolation} in it"
|
2012-11-14 16:17:21 +04:00
|
|
|
30 font-lock-comment-face)
|
2012-09-08 19:13:14 +04:00
|
|
|
(ruby-assert-face "# #{comment}\n \"#{interpolation}\"" 16
|
2012-11-14 16:17:21 +04:00
|
|
|
font-lock-variable-name-face))
|
|
|
|
|
2012-12-14 08:55:23 +04:00
|
|
|
(ert-deftest ruby-interpolation-suppresses-quotes-inside ()
|
2012-11-14 16:17:21 +04:00
|
|
|
(let ((s "\"<ul><li>#{@files.join(\"</li><li>\")}</li></ul>\""))
|
|
|
|
(ruby-assert-state s 8 nil)
|
|
|
|
(ruby-assert-face s 9 font-lock-string-face)
|
|
|
|
(ruby-assert-face s 10 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face s 41 font-lock-string-face)))
|
|
|
|
|
2012-12-14 08:55:23 +04:00
|
|
|
(ert-deftest ruby-interpolation-suppresses-one-double-quote ()
|
|
|
|
(let ((s "\"foo#{'\"'}\""))
|
|
|
|
(ruby-assert-state s 8 nil)
|
|
|
|
(ruby-assert-face s 8 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face s 11 font-lock-string-face)))
|
|
|
|
|
|
|
|
(ert-deftest ruby-interpolation-suppresses-one-backtick ()
|
|
|
|
(let ((s "`as#{'`'}das`"))
|
|
|
|
(ruby-assert-state s 8 nil)))
|
|
|
|
|
|
|
|
(ert-deftest ruby-interpolation-keeps-non-quote-syntax ()
|
|
|
|
(let ((s "\"foo#{baz.tee}bar\""))
|
2012-12-14 10:58:15 +04:00
|
|
|
(ruby-with-temp-buffer s
|
|
|
|
(goto-char (point-min))
|
2012-12-14 08:55:23 +04:00
|
|
|
(ruby-mode)
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-28 23:45:29 -04:00
|
|
|
(syntax-propertize (point-max))
|
2012-12-14 08:55:23 +04:00
|
|
|
(search-forward "tee")
|
|
|
|
(should (string= (thing-at-point 'symbol) "tee")))))
|
|
|
|
|
2013-05-19 10:01:23 +04:00
|
|
|
(ert-deftest ruby-interpolation-inside-percent-literal ()
|
|
|
|
(let ((s "%( #{boo} )"))
|
|
|
|
(ruby-assert-face s 1 font-lock-string-face)
|
|
|
|
(ruby-assert-face s 4 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face s 10 font-lock-string-face)
|
|
|
|
(ruby-assert-state s 8 nil)))
|
|
|
|
|
2012-11-14 16:17:21 +04:00
|
|
|
(ert-deftest ruby-interpolation-inside-percent-literal-with-paren ()
|
|
|
|
:expected-result :failed
|
|
|
|
(let ((s "%(^#{\")\"}^)"))
|
|
|
|
(ruby-assert-face s 3 font-lock-string-face)
|
|
|
|
(ruby-assert-face s 4 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face s 10 font-lock-string-face)
|
|
|
|
;; It's confused by the closing paren in the middle.
|
|
|
|
(ruby-assert-state s 8 nil)))
|
2012-09-07 08:15:56 +04:00
|
|
|
|
2013-05-31 10:04:33 +04:00
|
|
|
(ert-deftest ruby-interpolation-inside-double-quoted-percent-literals ()
|
|
|
|
(ruby-assert-face "%Q{foo #@bar}" 8 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face "%W{foo #@bar}" 8 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face "%r{foo #@bar}" 8 font-lock-variable-name-face)
|
|
|
|
(ruby-assert-face "%x{foo #@bar}" 8 font-lock-variable-name-face))
|
|
|
|
|
|
|
|
(ert-deftest ruby-no-interpolation-in-single-quoted-literals ()
|
|
|
|
(ruby-assert-face "'foo #@bar'" 7 font-lock-string-face)
|
|
|
|
(ruby-assert-face "%q{foo #@bar}" 8 font-lock-string-face)
|
|
|
|
(ruby-assert-face "%w{foo #@bar}" 8 font-lock-string-face)
|
|
|
|
(ruby-assert-face "%s{foo #@bar}" 8 font-lock-string-face))
|
|
|
|
|
2014-05-06 03:18:18 +04:00
|
|
|
(ert-deftest ruby-interpolation-after-dollar-sign ()
|
|
|
|
(ruby-assert-face "\"$#{balance}\"" 2 'font-lock-string-face)
|
|
|
|
(ruby-assert-face "\"$#{balance}\"" 3 'font-lock-variable-name-face))
|
|
|
|
|
2013-05-31 10:04:33 +04:00
|
|
|
(ert-deftest ruby-no-unknown-percent-literals ()
|
|
|
|
;; No folding of case.
|
|
|
|
(ruby-assert-face "%S{foo}" 4 nil)
|
|
|
|
(ruby-assert-face "%R{foo}" 4 nil))
|
|
|
|
|
2012-11-13 13:30:16 +04:00
|
|
|
(ert-deftest ruby-add-log-current-method-examples ()
|
|
|
|
(let ((pairs '(("foo" . "#foo")
|
|
|
|
("C.foo" . ".foo")
|
|
|
|
("self.foo" . ".foo"))))
|
2012-12-02 14:06:32 +08:00
|
|
|
(dolist (pair pairs)
|
|
|
|
(let ((name (car pair))
|
2012-12-14 10:58:15 +04:00
|
|
|
(value (cdr pair)))
|
|
|
|
(ruby-with-temp-buffer (ruby-test-string
|
|
|
|
"module M
|
|
|
|
| class C
|
|
|
|
| def %s
|
|
|
|
| _
|
|
|
|
| end
|
|
|
|
| end
|
|
|
|
|end"
|
|
|
|
name)
|
|
|
|
(search-backward "_")
|
|
|
|
(forward-line)
|
|
|
|
(should (string= (ruby-add-log-current-method)
|
|
|
|
(format "M::C%s" value))))))))
|
|
|
|
|
|
|
|
(ert-deftest ruby-add-log-current-method-outside-of-method ()
|
|
|
|
(ruby-with-temp-buffer (ruby-test-string
|
|
|
|
"module M
|
|
|
|
| class C
|
|
|
|
| def foo
|
|
|
|
| end
|
|
|
|
| _
|
|
|
|
| end
|
|
|
|
|end")
|
|
|
|
(search-backward "_")
|
|
|
|
(should (string= (ruby-add-log-current-method)"M::C"))))
|
|
|
|
|
|
|
|
(ert-deftest ruby-add-log-current-method-in-singleton-class ()
|
|
|
|
(ruby-with-temp-buffer (ruby-test-string
|
|
|
|
"class C
|
|
|
|
| class << self
|
|
|
|
| def foo
|
|
|
|
| _
|
|
|
|
| end
|
|
|
|
| end
|
|
|
|
|end")
|
|
|
|
(search-backward "_")
|
|
|
|
(should (string= (ruby-add-log-current-method) "C.foo"))))
|
|
|
|
|
|
|
|
(ert-deftest ruby-add-log-current-method-namespace-shorthand ()
|
|
|
|
(ruby-with-temp-buffer (ruby-test-string
|
|
|
|
"class C::D
|
|
|
|
| def foo
|
|
|
|
| _
|
|
|
|
| end
|
|
|
|
|end")
|
|
|
|
(search-backward "_")
|
|
|
|
(should (string= (ruby-add-log-current-method) "C::D#foo"))))
|
|
|
|
|
|
|
|
(ert-deftest ruby-add-log-current-method-after-inner-class ()
|
|
|
|
(ruby-with-temp-buffer (ruby-test-string
|
|
|
|
"module M
|
|
|
|
| class C
|
|
|
|
| class D
|
|
|
|
| end
|
2013-02-14 09:45:33 +04:00
|
|
|
| def foo
|
|
|
|
| _
|
|
|
|
| end
|
2012-12-14 10:58:15 +04:00
|
|
|
| end
|
|
|
|
|end")
|
|
|
|
(search-backward "_")
|
2013-02-14 09:45:33 +04:00
|
|
|
(should (string= (ruby-add-log-current-method) "M::C#foo"))))
|
2012-11-13 13:30:16 +04:00
|
|
|
|
2012-11-13 22:57:26 +04:00
|
|
|
(defvar ruby-block-test-example
|
|
|
|
(ruby-test-string
|
|
|
|
"class C
|
|
|
|
| def foo
|
|
|
|
| 1
|
|
|
|
| end
|
|
|
|
|
|
|
|
|
| def bar
|
|
|
|
| 2
|
|
|
|
| end
|
|
|
|
|
|
|
|
|
| def baz
|
2013-01-28 05:20:42 +04:00
|
|
|
|some do
|
|
|
|
|3
|
2012-11-13 22:57:26 +04:00
|
|
|
| end
|
|
|
|
| end
|
|
|
|
|end"))
|
|
|
|
|
|
|
|
(defmacro ruby-deftest-move-to-block (name &rest body)
|
2013-10-10 17:43:47 -04:00
|
|
|
(declare (indent defun))
|
2012-11-13 22:57:26 +04:00
|
|
|
`(ert-deftest ,(intern (format "ruby-move-to-block-%s" name)) ()
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert ruby-block-test-example)
|
|
|
|
(ruby-mode)
|
2013-07-11 09:04:56 -07:00
|
|
|
(goto-char (point-min))
|
2012-11-13 22:57:26 +04:00
|
|
|
,@body)))
|
|
|
|
|
|
|
|
(ruby-deftest-move-to-block works-on-do
|
2013-07-11 09:04:56 -07:00
|
|
|
(forward-line 10)
|
2012-11-13 22:57:26 +04:00
|
|
|
(ruby-end-of-block)
|
2013-01-28 05:20:42 +04:00
|
|
|
(should (= 13 (line-number-at-pos)))
|
2012-11-13 22:57:26 +04:00
|
|
|
(ruby-beginning-of-block)
|
|
|
|
(should (= 11 (line-number-at-pos))))
|
|
|
|
|
|
|
|
(ruby-deftest-move-to-block zero-is-noop
|
2013-07-11 09:04:56 -07:00
|
|
|
(forward-line 4)
|
2012-11-13 22:57:26 +04:00
|
|
|
(ruby-move-to-block 0)
|
|
|
|
(should (= 5 (line-number-at-pos))))
|
|
|
|
|
|
|
|
(ruby-deftest-move-to-block ok-with-three
|
2013-07-11 09:04:56 -07:00
|
|
|
(forward-line 1)
|
2012-11-13 22:57:26 +04:00
|
|
|
(ruby-move-to-block 3)
|
2013-01-28 05:20:42 +04:00
|
|
|
(should (= 14 (line-number-at-pos))))
|
2012-11-13 22:57:26 +04:00
|
|
|
|
|
|
|
(ruby-deftest-move-to-block ok-with-minus-two
|
2013-07-11 09:04:56 -07:00
|
|
|
(forward-line 9)
|
2012-11-13 22:57:26 +04:00
|
|
|
(ruby-move-to-block -2)
|
|
|
|
(should (= 2 (line-number-at-pos))))
|
|
|
|
|
2013-02-13 12:15:05 +04:00
|
|
|
(ert-deftest ruby-move-to-block-skips-percent-literal ()
|
|
|
|
(dolist (s (list (ruby-test-string
|
|
|
|
"foo do
|
|
|
|
| a = %%w(
|
2013-02-14 07:33:55 +04:00
|
|
|
| def yaa
|
2013-02-13 12:15:05 +04:00
|
|
|
| )
|
|
|
|
|end")
|
|
|
|
(ruby-test-string
|
|
|
|
"foo do
|
|
|
|
| a = %%w|
|
2013-02-14 07:33:55 +04:00
|
|
|
| end
|
2013-02-13 12:15:05 +04:00
|
|
|
| |
|
|
|
|
|end")))
|
|
|
|
(ruby-with-temp-buffer s
|
2013-07-11 09:04:56 -07:00
|
|
|
(goto-char (point-min))
|
2013-02-13 12:15:05 +04:00
|
|
|
(ruby-end-of-block)
|
2013-02-14 07:33:55 +04:00
|
|
|
(should (= 5 (line-number-at-pos)))
|
2013-02-13 12:15:05 +04:00
|
|
|
(ruby-beginning-of-block)
|
|
|
|
(should (= 1 (line-number-at-pos))))))
|
|
|
|
|
2013-02-14 07:33:55 +04:00
|
|
|
(ert-deftest ruby-move-to-block-skips-heredoc ()
|
|
|
|
(ruby-with-temp-buffer
|
|
|
|
(ruby-test-string
|
|
|
|
"if something_wrong?
|
|
|
|
| ActiveSupport::Deprecation.warn(<<-eowarn)
|
|
|
|
| boo hoo
|
|
|
|
| end
|
|
|
|
| eowarn
|
|
|
|
|end")
|
2013-07-11 09:04:56 -07:00
|
|
|
(goto-char (point-min))
|
2013-02-14 07:33:55 +04:00
|
|
|
(ruby-end-of-block)
|
|
|
|
(should (= 6 (line-number-at-pos)))
|
|
|
|
(ruby-beginning-of-block)
|
|
|
|
(should (= 1 (line-number-at-pos)))))
|
|
|
|
|
2013-04-16 03:07:14 +04:00
|
|
|
(ert-deftest ruby-move-to-block-does-not-fold-case ()
|
|
|
|
(ruby-with-temp-buffer
|
|
|
|
(ruby-test-string
|
|
|
|
"foo do
|
|
|
|
| Module.to_s
|
|
|
|
|end")
|
|
|
|
(let ((case-fold-search t))
|
|
|
|
(ruby-beginning-of-block))
|
|
|
|
(should (= 1 (line-number-at-pos)))))
|
|
|
|
|
2013-07-03 05:02:18 +04:00
|
|
|
(ert-deftest ruby-move-to-block-moves-from-else-to-if ()
|
|
|
|
(ruby-with-temp-buffer (ruby-test-string
|
|
|
|
"if true
|
|
|
|
| nested_block do
|
|
|
|
| end
|
|
|
|
|else
|
|
|
|
|end")
|
2013-07-11 09:04:56 -07:00
|
|
|
(goto-char (point-min))
|
|
|
|
(forward-line 3)
|
2013-07-03 05:02:18 +04:00
|
|
|
(ruby-beginning-of-block)
|
|
|
|
(should (= 1 (line-number-at-pos)))))
|
|
|
|
|
2013-04-16 03:07:14 +04:00
|
|
|
(ert-deftest ruby-beginning-of-defun-does-not-fold-case ()
|
|
|
|
(ruby-with-temp-buffer
|
|
|
|
(ruby-test-string
|
|
|
|
"class C
|
|
|
|
| def bar
|
|
|
|
| Class.to_s
|
|
|
|
| end
|
|
|
|
|end")
|
2013-07-11 09:04:56 -07:00
|
|
|
(goto-char (point-min))
|
|
|
|
(forward-line 3)
|
2013-04-16 03:07:14 +04:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(beginning-of-defun))
|
|
|
|
(should (= 2 (line-number-at-pos)))))
|
|
|
|
|
|
|
|
(ert-deftest ruby-end-of-defun-skips-to-next-line-after-the-method ()
|
|
|
|
(ruby-with-temp-buffer
|
|
|
|
(ruby-test-string
|
|
|
|
"class D
|
|
|
|
| def tee
|
|
|
|
| 'ho hum'
|
|
|
|
| end
|
|
|
|
|end")
|
2013-07-11 09:04:56 -07:00
|
|
|
(goto-char (point-min))
|
|
|
|
(forward-line 1)
|
2013-04-16 03:07:14 +04:00
|
|
|
(end-of-defun)
|
|
|
|
(should (= 5 (line-number-at-pos)))))
|
|
|
|
|
2013-10-06 04:21:51 +03:00
|
|
|
(defvar ruby-sexp-test-example
|
|
|
|
(ruby-test-string
|
|
|
|
"class C
|
|
|
|
| def foo
|
|
|
|
| self.end
|
|
|
|
| D.new.class
|
2013-10-09 06:18:01 +03:00
|
|
|
| [1, 2, 3].map do |i|
|
|
|
|
| i + 1
|
|
|
|
| end.sum
|
2013-10-06 04:21:51 +03:00
|
|
|
| end
|
|
|
|
|end"))
|
|
|
|
|
|
|
|
(ert-deftest ruby-forward-sexp-skips-method-calls-with-keyword-names ()
|
|
|
|
(ruby-with-temp-buffer ruby-sexp-test-example
|
|
|
|
(goto-line 2)
|
|
|
|
(ruby-forward-sexp)
|
2013-10-09 06:18:01 +03:00
|
|
|
(should (= 8 (line-number-at-pos)))))
|
2013-10-06 04:21:51 +03:00
|
|
|
|
|
|
|
(ert-deftest ruby-backward-sexp-skips-method-calls-with-keyword-names ()
|
|
|
|
(ruby-with-temp-buffer ruby-sexp-test-example
|
2013-10-09 06:18:01 +03:00
|
|
|
(goto-line 8)
|
2013-10-06 04:21:51 +03:00
|
|
|
(end-of-line)
|
|
|
|
(ruby-backward-sexp)
|
|
|
|
(should (= 2 (line-number-at-pos)))))
|
|
|
|
|
2013-11-20 13:51:12 +02:00
|
|
|
(ert-deftest ruby--insert-coding-comment-ruby-style ()
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((ruby-encoding-magic-comment-style 'ruby))
|
|
|
|
(ruby--insert-coding-comment "utf-8")
|
|
|
|
(should (string= "# coding: utf-8\n" (buffer-string))))))
|
|
|
|
|
|
|
|
(ert-deftest ruby--insert-coding-comment-emacs-style ()
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((ruby-encoding-magic-comment-style 'emacs))
|
|
|
|
(ruby--insert-coding-comment "utf-8")
|
|
|
|
(should (string= "# -*- coding: utf-8 -*-\n" (buffer-string))))))
|
|
|
|
|
|
|
|
(ert-deftest ruby--insert-coding-comment-custom-style ()
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((ruby-encoding-magic-comment-style 'custom)
|
|
|
|
(ruby-custom-encoding-magic-comment-template "# encoding: %s\n"))
|
|
|
|
(ruby--insert-coding-comment "utf-8")
|
|
|
|
(should (string= "# encoding: utf-8\n\n" (buffer-string))))))
|
|
|
|
|
|
|
|
|
2012-07-20 07:10:25 -04:00
|
|
|
(provide 'ruby-mode-tests)
|
|
|
|
|
|
|
|
;;; ruby-mode-tests.el ends here
|