2008-12-10 18:59:26 +00:00
|
|
|
;;; ruby-mode.el --- Major mode for editing Ruby files
|
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2009-01-10 22:08:37 +00:00
|
|
|
;; Authors: Yukihiro Matsumoto
|
|
|
|
;; Nobuyoshi Nakada
|
2008-12-10 18:59:26 +00:00
|
|
|
;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode
|
|
|
|
;; Created: Fri Feb 4 14:49:13 JST 1994
|
|
|
|
;; Keywords: languages ruby
|
2012-12-24 07:14:49 +00:00
|
|
|
;; Version: 1.2
|
2008-12-10 18:59:26 +00: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:
|
|
|
|
|
|
|
|
;; Provides font-locking, indentation support, and navigation for Ruby code.
|
|
|
|
;;
|
|
|
|
;; If you're installing manually, you should add this to your .emacs
|
|
|
|
;; file after putting it on your load path:
|
|
|
|
;;
|
|
|
|
;; (autoload 'ruby-mode "ruby-mode" "Major mode for ruby files" t)
|
|
|
|
;; (add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))
|
|
|
|
;; (add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
|
|
|
|
;;
|
|
|
|
;; Still needs more docstrings; search below for TODO.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
2010-08-24 20:29:44 +00:00
|
|
|
(defgroup ruby nil
|
|
|
|
"Major mode for editing Ruby code."
|
|
|
|
:prefix "ruby-"
|
|
|
|
:group 'languages)
|
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defconst ruby-block-beg-keywords
|
|
|
|
'("class" "module" "def" "if" "unless" "case" "while" "until" "for" "begin" "do")
|
|
|
|
"Keywords at the beginning of blocks.")
|
|
|
|
|
|
|
|
(defconst ruby-block-beg-re
|
|
|
|
(regexp-opt ruby-block-beg-keywords)
|
|
|
|
"Regexp to match the beginning of blocks.")
|
|
|
|
|
|
|
|
(defconst ruby-non-block-do-re
|
2013-07-16 19:16:51 +00:00
|
|
|
(regexp-opt '("while" "until" "for" "rescue") 'symbols)
|
2008-12-10 18:59:26 +00:00
|
|
|
"Regexp to match keywords that nest without blocks.")
|
|
|
|
|
|
|
|
(defconst ruby-indent-beg-re
|
2012-12-26 16:45:19 +00:00
|
|
|
(concat "^\\(\\s *" (regexp-opt '("class" "module" "def")) "\\|"
|
|
|
|
(regexp-opt '("if" "unless" "case" "while" "until" "for" "begin"))
|
|
|
|
"\\)\\_>")
|
2008-12-10 18:59:26 +00:00
|
|
|
"Regexp to match where the indentation gets deeper.")
|
|
|
|
|
|
|
|
(defconst ruby-modifier-beg-keywords
|
|
|
|
'("if" "unless" "while" "until")
|
|
|
|
"Modifiers that are the same as the beginning of blocks.")
|
|
|
|
|
|
|
|
(defconst ruby-modifier-beg-re
|
|
|
|
(regexp-opt ruby-modifier-beg-keywords)
|
|
|
|
"Regexp to match modifiers same as the beginning of blocks.")
|
|
|
|
|
|
|
|
(defconst ruby-modifier-re
|
|
|
|
(regexp-opt (cons "rescue" ruby-modifier-beg-keywords))
|
|
|
|
"Regexp to match modifiers.")
|
|
|
|
|
|
|
|
(defconst ruby-block-mid-keywords
|
|
|
|
'("then" "else" "elsif" "when" "rescue" "ensure")
|
|
|
|
"Keywords where the indentation gets shallower in middle of block statements.")
|
|
|
|
|
|
|
|
(defconst ruby-block-mid-re
|
|
|
|
(regexp-opt ruby-block-mid-keywords)
|
|
|
|
"Regexp to match where the indentation gets shallower in middle of block statements.")
|
|
|
|
|
|
|
|
(defconst ruby-block-op-keywords
|
|
|
|
'("and" "or" "not")
|
|
|
|
"Regexp to match boolean keywords.")
|
|
|
|
|
|
|
|
(defconst ruby-block-hanging-re
|
|
|
|
(regexp-opt (append ruby-modifier-beg-keywords ruby-block-op-keywords))
|
|
|
|
"Regexp to match hanging block modifiers.")
|
|
|
|
|
2012-03-21 18:33:07 +00:00
|
|
|
(defconst ruby-block-end-re "\\_<end\\_>")
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2012-09-07 05:06:05 +00:00
|
|
|
(defconst ruby-defun-beg-re
|
|
|
|
'"\\(def\\|class\\|module\\)"
|
|
|
|
"Regexp to match the beginning of a defun, in the general sense.")
|
|
|
|
|
2012-12-14 06:58:15 +00:00
|
|
|
(defconst ruby-singleton-class-re
|
|
|
|
"class\\s *<<"
|
|
|
|
"Regexp to match the beginning of a singleton class context.")
|
|
|
|
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(eval-and-compile
|
|
|
|
(defconst ruby-here-doc-beg-re
|
2008-12-10 18:59:26 +00:00
|
|
|
"\\(<\\)<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)"
|
2012-11-14 12:17:21 +00:00
|
|
|
"Regexp to match the beginning of a heredoc.")
|
|
|
|
|
|
|
|
(defconst ruby-expression-expansion-re
|
2013-05-19 06:01:23 +00:00
|
|
|
"\\(?:[^\\]\\|\\=\\)\\(\\\\\\\\\\)*\\(#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)\\)"))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-here-doc-end-match ()
|
|
|
|
"Return a regexp to find the end of a heredoc.
|
|
|
|
|
|
|
|
This should only be called after matching against `ruby-here-doc-beg-re'."
|
|
|
|
(concat "^"
|
|
|
|
(if (match-string 2) "[ \t]*" nil)
|
|
|
|
(regexp-quote
|
|
|
|
(or (match-string 4)
|
|
|
|
(match-string 5)
|
|
|
|
(match-string 6)))))
|
|
|
|
|
|
|
|
(defconst ruby-delimiter
|
2012-03-21 18:33:07 +00:00
|
|
|
(concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\_<\\("
|
2008-12-10 18:59:26 +00:00
|
|
|
ruby-block-beg-re
|
2012-03-21 18:33:07 +00:00
|
|
|
"\\)\\_>\\|" ruby-block-end-re
|
2008-12-10 18:59:26 +00:00
|
|
|
"\\|^=begin\\|" ruby-here-doc-beg-re))
|
|
|
|
|
|
|
|
(defconst ruby-negative
|
|
|
|
(concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|"
|
|
|
|
ruby-block-end-re "\\|}\\|\\]\\)")
|
|
|
|
"Regexp to match where the indentation gets shallower.")
|
|
|
|
|
2013-09-15 23:42:26 +00:00
|
|
|
(defconst ruby-operator-re "[-,.+*/%&|^~=<>:]\\|\\\\$"
|
2008-12-10 18:59:26 +00:00
|
|
|
"Regexp to match operators.")
|
|
|
|
|
|
|
|
(defconst ruby-symbol-chars "a-zA-Z0-9_"
|
|
|
|
"List of characters that symbol names may contain.")
|
2013-09-03 00:29:10 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]")
|
|
|
|
"Regexp to match symbols.")
|
|
|
|
|
2013-10-05 18:37:08 +00:00
|
|
|
(defvar ruby-use-smie t)
|
2013-05-08 20:25:57 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defvar ruby-mode-map
|
|
|
|
(let ((map (make-sparse-keymap)))
|
2013-05-08 20:25:57 +00:00
|
|
|
(unless ruby-use-smie
|
|
|
|
(define-key map (kbd "M-C-b") 'ruby-backward-sexp)
|
|
|
|
(define-key map (kbd "M-C-f") 'ruby-forward-sexp)
|
|
|
|
(define-key map (kbd "M-C-q") 'ruby-indent-exp))
|
2013-10-21 03:50:06 +00:00
|
|
|
(when ruby-use-smie
|
|
|
|
(define-key map (kbd "M-C-d") 'smie-down-list))
|
2008-12-10 18:59:26 +00:00
|
|
|
(define-key map (kbd "M-C-p") 'ruby-beginning-of-block)
|
|
|
|
(define-key map (kbd "M-C-n") 'ruby-end-of-block)
|
2012-08-12 22:06:56 +00:00
|
|
|
(define-key map (kbd "C-c {") 'ruby-toggle-block)
|
2008-12-10 18:59:26 +00:00
|
|
|
map)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Keymap used in Ruby mode.")
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-10-25 02:38:39 +00:00
|
|
|
(easy-menu-define
|
|
|
|
ruby-mode-menu
|
|
|
|
ruby-mode-map
|
|
|
|
"Ruby Mode Menu"
|
|
|
|
'("Ruby"
|
2013-10-25 04:35:56 +00:00
|
|
|
["Beginning of Block" ruby-beginning-of-block t]
|
|
|
|
["End of Block" ruby-end-of-block t]
|
2013-10-25 02:38:39 +00:00
|
|
|
["Toggle Block" ruby-toggle-block t]
|
|
|
|
"--"
|
|
|
|
["Backward Sexp" ruby-backward-sexp
|
2013-10-25 04:35:56 +00:00
|
|
|
:visible (not ruby-use-smie)]
|
|
|
|
["Backward Sexp" backward-sexp
|
|
|
|
:visible ruby-use-smie]
|
2013-10-25 02:38:39 +00:00
|
|
|
["Forward Sexp" ruby-forward-sexp
|
2013-10-25 04:35:56 +00:00
|
|
|
:visible (not ruby-use-smie)]
|
|
|
|
["Forward Sexp" forward-sexp
|
|
|
|
:visible ruby-use-smie]
|
|
|
|
["Indent Sexp" ruby-indent-exp
|
|
|
|
:visible (not ruby-use-smie)]
|
|
|
|
["Indent Sexp" prog-indent-sexp
|
|
|
|
:visible ruby-use-smie]))
|
2013-10-25 02:38:39 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defvar ruby-mode-syntax-table
|
|
|
|
(let ((table (make-syntax-table)))
|
|
|
|
(modify-syntax-entry ?\' "\"" table)
|
|
|
|
(modify-syntax-entry ?\" "\"" table)
|
|
|
|
(modify-syntax-entry ?\` "\"" table)
|
|
|
|
(modify-syntax-entry ?# "<" table)
|
|
|
|
(modify-syntax-entry ?\n ">" table)
|
|
|
|
(modify-syntax-entry ?\\ "\\" table)
|
|
|
|
(modify-syntax-entry ?$ "." table)
|
|
|
|
(modify-syntax-entry ?? "_" table)
|
|
|
|
(modify-syntax-entry ?_ "_" table)
|
2012-03-21 18:33:07 +00:00
|
|
|
(modify-syntax-entry ?: "_" table)
|
2008-12-10 18:59:26 +00:00
|
|
|
(modify-syntax-entry ?< "." table)
|
|
|
|
(modify-syntax-entry ?> "." table)
|
|
|
|
(modify-syntax-entry ?& "." table)
|
|
|
|
(modify-syntax-entry ?| "." table)
|
|
|
|
(modify-syntax-entry ?% "." table)
|
|
|
|
(modify-syntax-entry ?= "." table)
|
|
|
|
(modify-syntax-entry ?/ "." table)
|
|
|
|
(modify-syntax-entry ?+ "." table)
|
|
|
|
(modify-syntax-entry ?* "." table)
|
|
|
|
(modify-syntax-entry ?- "." table)
|
|
|
|
(modify-syntax-entry ?\; "." table)
|
|
|
|
(modify-syntax-entry ?\( "()" table)
|
|
|
|
(modify-syntax-entry ?\) ")(" table)
|
|
|
|
(modify-syntax-entry ?\{ "(}" table)
|
|
|
|
(modify-syntax-entry ?\} "){" table)
|
|
|
|
(modify-syntax-entry ?\[ "(]" table)
|
|
|
|
(modify-syntax-entry ?\] ")[" table)
|
|
|
|
table)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Syntax table to use in Ruby mode.")
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defcustom ruby-indent-tabs-mode nil
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Indentation can insert tabs in Ruby mode if this is non-nil."
|
2013-11-01 03:35:35 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'ruby
|
|
|
|
:safe 'booleanp)
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defcustom ruby-indent-level 2
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Indentation of Ruby statements."
|
2013-11-01 03:35:35 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'ruby
|
|
|
|
:safe 'integerp)
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-10-05 18:37:08 +00:00
|
|
|
(defcustom ruby-comment-column (default-value 'comment-column)
|
2008-12-10 18:59:26 +00:00
|
|
|
"Indentation column of comments."
|
2013-11-01 03:35:35 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'ruby
|
|
|
|
:safe 'integerp)
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defcustom ruby-deep-arglist t
|
|
|
|
"Deep indent lists in parenthesis when non-nil.
|
|
|
|
Also ignores spaces after parenthesis when 'space."
|
2013-11-01 03:35:35 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'ruby
|
|
|
|
:safe 'booleanp)
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Deep indent lists in parenthesis when non-nil.
|
|
|
|
The value t means continuous line.
|
2008-12-10 18:59:26 +00:00
|
|
|
Also ignores spaces after parenthesis when 'space."
|
|
|
|
:group 'ruby)
|
|
|
|
|
|
|
|
(defcustom ruby-deep-indent-paren-style 'space
|
|
|
|
"Default deep indent style."
|
|
|
|
:options '(t nil space) :group 'ruby)
|
|
|
|
|
2013-10-14 00:23:29 +00:00
|
|
|
(defcustom ruby-encoding-map
|
|
|
|
'((us-ascii . nil) ;; Do not put coding: us-ascii
|
|
|
|
(shift-jis . cp932) ;; Emacs charset name of Shift_JIS
|
|
|
|
(shift_jis . cp932) ;; MIME charset name of Shift_JIS
|
|
|
|
(japanese-cp932 . cp932)) ;; Emacs charset name of CP932
|
|
|
|
"Alist to map encoding name from Emacs to Ruby.
|
|
|
|
Associating an encoding name with nil means it needs not be
|
|
|
|
explicitly declared in magic comment."
|
|
|
|
:type '(repeat (cons (symbol :tag "From") (symbol :tag "To")))
|
2008-12-10 18:59:26 +00:00
|
|
|
:group 'ruby)
|
|
|
|
|
|
|
|
(defcustom ruby-insert-encoding-magic-comment t
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Insert a magic Emacs 'coding' comment upon save if this is non-nil."
|
2008-12-10 18:59:26 +00:00
|
|
|
:type 'boolean :group 'ruby)
|
|
|
|
|
|
|
|
(defcustom ruby-use-encoding-map t
|
|
|
|
"Use `ruby-encoding-map' to set encoding magic comment if this is non-nil."
|
|
|
|
:type 'boolean :group 'ruby)
|
|
|
|
|
2013-05-08 20:25:57 +00:00
|
|
|
;;; SMIE support
|
|
|
|
|
|
|
|
(require 'smie)
|
|
|
|
|
2013-10-21 05:54:18 +00:00
|
|
|
;; Here's a simplified BNF grammar, for reference:
|
|
|
|
;; http://www.cse.buffalo.edu/~regan/cse305/RubyBNF.pdf
|
2013-05-08 20:25:57 +00:00
|
|
|
(defconst ruby-smie-grammar
|
|
|
|
(smie-prec2->grammar
|
2013-10-21 05:54:18 +00:00
|
|
|
(smie-merge-prec2s
|
|
|
|
(smie-bnf->prec2
|
|
|
|
'((id)
|
|
|
|
(insts (inst) (insts ";" insts))
|
2013-11-08 02:31:51 +00:00
|
|
|
(inst (exp) (inst "iuwu-mod" exp)
|
|
|
|
;; Somewhat incorrect (both can be used multiple times),
|
|
|
|
;; but avoids lots of conflicts:
|
|
|
|
(exp "and" exp) (exp "or" exp))
|
2013-10-21 05:54:18 +00:00
|
|
|
(exp (exp1) (exp "," exp) (exp "=" exp)
|
2013-10-21 22:25:59 +00:00
|
|
|
(id " @ " exp)
|
2013-11-07 01:58:12 +00:00
|
|
|
(exp "." id))
|
2013-10-21 05:54:18 +00:00
|
|
|
(exp1 (exp2) (exp2 "?" exp1 ":" exp1))
|
|
|
|
(exp2 ("def" insts "end")
|
|
|
|
("begin" insts-rescue-insts "end")
|
|
|
|
("do" insts "end")
|
|
|
|
("class" insts "end") ("module" insts "end")
|
|
|
|
("for" for-body "end")
|
|
|
|
("[" expseq "]")
|
|
|
|
("{" hashvals "}")
|
|
|
|
("{" insts "}")
|
|
|
|
("while" insts "end")
|
|
|
|
("until" insts "end")
|
|
|
|
("unless" insts "end")
|
|
|
|
("if" if-body "end")
|
|
|
|
("case" cases "end"))
|
|
|
|
(formal-params ("opening-|" exp "|"))
|
|
|
|
(for-body (for-head ";" insts))
|
|
|
|
(for-head (id "in" exp))
|
|
|
|
(cases (exp "then" insts) ;; FIXME: Ruby also allows (exp ":" insts).
|
|
|
|
(cases "when" cases) (insts "else" insts))
|
|
|
|
(expseq (exp) );;(expseq "," expseq)
|
|
|
|
(hashvals (id "=>" exp1) (hashvals "," hashvals))
|
|
|
|
(insts-rescue-insts (insts)
|
|
|
|
(insts-rescue-insts "rescue" insts-rescue-insts)
|
|
|
|
(insts-rescue-insts "ensure" insts-rescue-insts))
|
|
|
|
(itheni (insts) (exp "then" insts))
|
|
|
|
(ielsei (itheni) (itheni "else" insts))
|
|
|
|
(if-body (ielsei) (if-body "elsif" if-body)))
|
|
|
|
'((nonassoc "in") (assoc ";") (right " @ ")
|
2013-10-21 22:25:59 +00:00
|
|
|
(assoc ",") (right "=") (assoc "."))
|
2013-10-21 05:54:18 +00:00
|
|
|
'((assoc "when"))
|
|
|
|
'((assoc "elsif"))
|
|
|
|
'((assoc "rescue" "ensure"))
|
|
|
|
'((assoc ",")))
|
|
|
|
|
|
|
|
(smie-precs->prec2
|
|
|
|
'((right "=")
|
|
|
|
(right "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^="
|
|
|
|
"<<=" ">>=" "&&=" "||=")
|
|
|
|
(left ".." "...")
|
|
|
|
(left "+" "-")
|
|
|
|
(left "*" "/" "%" "**")
|
|
|
|
;; (left "|") ; FIXME: Conflicts with | after block parameters.
|
2013-11-08 02:31:51 +00:00
|
|
|
(left "&&" "||")
|
2013-10-21 05:54:18 +00:00
|
|
|
(left "^" "&")
|
|
|
|
(nonassoc "<=>")
|
|
|
|
(nonassoc ">" ">=" "<" "<=")
|
|
|
|
(nonassoc "==" "===" "!=")
|
|
|
|
(nonassoc "=~" "!~")
|
2013-11-08 02:31:51 +00:00
|
|
|
(left "<<" ">>"))))))
|
2013-05-08 20:25:57 +00:00
|
|
|
|
|
|
|
(defun ruby-smie--bosp ()
|
|
|
|
(save-excursion (skip-chars-backward " \t")
|
2013-10-27 03:25:03 +00:00
|
|
|
(or (bolp) (memq (char-before) '(?\; ?=)))))
|
2013-05-08 20:25:57 +00:00
|
|
|
|
|
|
|
(defun ruby-smie--implicit-semi-p ()
|
|
|
|
(save-excursion
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(not (or (bolp)
|
2013-10-05 18:37:08 +00:00
|
|
|
(and (memq (char-before)
|
2013-11-07 03:02:01 +00:00
|
|
|
'(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\[ ?\( ?\{ ?\\ ?& ?> ?< ?% ?~ ?^))
|
2013-08-29 18:06:46 +00:00
|
|
|
;; Make sure it's not the end of a regexp.
|
|
|
|
(not (eq (car (syntax-after (1- (point)))) 7)))
|
2013-10-11 02:11:37 +00:00
|
|
|
(and (eq (char-before) ?\?)
|
|
|
|
(equal (save-excursion (ruby-smie--backward-token)) "?"))
|
|
|
|
(and (eq (char-before) ?=)
|
|
|
|
(string-match "\\`\\s." (save-excursion
|
|
|
|
(ruby-smie--backward-token))))
|
2013-10-09 03:18:01 +00:00
|
|
|
(and (eq (car (syntax-after (1- (point)))) 2)
|
2013-11-07 03:02:01 +00:00
|
|
|
(member (save-excursion (ruby-smie--backward-token))
|
|
|
|
'("iuwu-mod" "and" "or")))
|
2013-10-07 23:01:23 +00:00
|
|
|
(save-excursion
|
|
|
|
(forward-comment 1)
|
|
|
|
(eq (char-after) ?.))))))
|
2013-08-29 18:06:46 +00:00
|
|
|
|
2013-10-07 03:38:26 +00:00
|
|
|
(defun ruby-smie--redundant-do-p (&optional skip)
|
|
|
|
(save-excursion
|
|
|
|
(if skip (backward-word 1))
|
2013-10-11 02:11:37 +00:00
|
|
|
(member (nth 2 (smie-backward-sexp ";")) '("while" "until" "for"))))
|
2013-10-07 03:38:26 +00:00
|
|
|
|
2013-08-29 18:06:46 +00:00
|
|
|
(defun ruby-smie--opening-pipe-p ()
|
|
|
|
(save-excursion
|
|
|
|
(if (eq ?| (char-before)) (forward-char -1))
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(or (eq ?\{ (char-before))
|
|
|
|
(looking-back "\\_<do" (- (point) 2)))))
|
2013-05-08 20:25:57 +00:00
|
|
|
|
2013-10-12 20:40:50 +00:00
|
|
|
(defun ruby-smie--args-separator-p (pos)
|
|
|
|
(and
|
2013-10-21 03:50:06 +00:00
|
|
|
(< pos (line-end-position))
|
2013-10-14 01:51:20 +00:00
|
|
|
(or (eq (char-syntax (preceding-char)) '?w)
|
2013-10-26 01:16:37 +00:00
|
|
|
;; FIXME: Check that the preceding token is not a keyword.
|
|
|
|
;; This isn't very important most of the time, though.
|
2013-10-14 01:51:20 +00:00
|
|
|
(and (memq (preceding-char) '(?! ??))
|
|
|
|
(eq (char-syntax (char-before (1- (point)))) '?w)))
|
2013-11-07 03:02:01 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char pos)
|
|
|
|
(or (and (eq (char-syntax (char-after)) ?w)
|
|
|
|
(not (looking-at (regexp-opt '("unless" "if" "while" "until"
|
2013-11-08 02:31:51 +00:00
|
|
|
"else" "elsif" "do" "end" "and" "or")
|
2013-11-07 03:02:01 +00:00
|
|
|
'symbols))))
|
|
|
|
(memq (syntax-after pos) '(7 15))
|
2013-11-08 02:31:51 +00:00
|
|
|
(looking-at "[([]\\|[-+!~:]\\sw")))))
|
2013-10-12 20:40:50 +00:00
|
|
|
|
2013-10-21 22:25:59 +00:00
|
|
|
(defun ruby-smie--at-dot-call ()
|
2013-10-23 02:59:45 +00:00
|
|
|
(and (eq ?w (char-syntax (following-char)))
|
2013-10-21 22:25:59 +00:00
|
|
|
(eq (char-before) ?.)
|
|
|
|
(not (eq (char-before (1- (point))) ?.))))
|
2013-10-07 03:38:26 +00:00
|
|
|
|
2013-05-08 20:25:57 +00:00
|
|
|
(defun ruby-smie--forward-token ()
|
2013-10-12 20:40:50 +00:00
|
|
|
(let ((pos (point)))
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
(cond
|
2013-11-04 10:50:47 +00:00
|
|
|
((looking-at "\\s\"") ;A heredoc or a string.
|
|
|
|
(if (not (looking-at "\n"))
|
|
|
|
""
|
|
|
|
;; Tokenize the whole heredoc as semicolon.
|
|
|
|
(goto-char (scan-sexps (point) 1))
|
|
|
|
";"))
|
2013-10-12 20:40:50 +00:00
|
|
|
((and (looking-at "[\n#]")
|
|
|
|
(ruby-smie--implicit-semi-p)) ;Only add implicit ; when needed.
|
|
|
|
(if (eolp) (forward-char 1) (forward-comment 1))
|
|
|
|
";")
|
|
|
|
(t
|
|
|
|
(forward-comment (point-max))
|
|
|
|
(cond
|
|
|
|
((looking-at ":\\s.+")
|
|
|
|
(goto-char (match-end 0)) (match-string 0)) ;; bug#15208.
|
|
|
|
((and (< pos (point))
|
|
|
|
(save-excursion
|
|
|
|
(ruby-smie--args-separator-p (prog1 (point) (goto-char pos)))))
|
|
|
|
" @ ")
|
|
|
|
(t
|
2013-10-21 22:25:59 +00:00
|
|
|
(let ((dot (ruby-smie--at-dot-call))
|
|
|
|
(tok (smie-default-forward-token)))
|
|
|
|
(when dot
|
|
|
|
(setq tok (concat "." tok)))
|
2013-10-07 03:38:26 +00:00
|
|
|
(cond
|
2013-10-12 20:40:50 +00:00
|
|
|
((member tok '("unless" "if" "while" "until"))
|
|
|
|
(if (save-excursion (forward-word -1) (ruby-smie--bosp))
|
|
|
|
tok "iuwu-mod"))
|
2013-11-08 02:31:51 +00:00
|
|
|
((string-match "|[*&]?" tok)
|
|
|
|
(forward-char (- 1 (length tok)))
|
|
|
|
(setq tok "|")
|
2013-10-12 20:40:50 +00:00
|
|
|
(if (ruby-smie--opening-pipe-p) "opening-|" tok))
|
|
|
|
((and (equal tok "") (looking-at "\\\\\n"))
|
|
|
|
(goto-char (match-end 0)) (ruby-smie--forward-token))
|
|
|
|
((equal tok "do")
|
|
|
|
(cond
|
|
|
|
((not (ruby-smie--redundant-do-p 'skip)) tok)
|
|
|
|
((> (save-excursion (forward-comment (point-max)) (point))
|
|
|
|
(line-end-position))
|
|
|
|
(ruby-smie--forward-token)) ;Fully redundant.
|
|
|
|
(t ";")))
|
|
|
|
(t tok)))))))))
|
2013-05-08 20:25:57 +00:00
|
|
|
|
|
|
|
(defun ruby-smie--backward-token ()
|
|
|
|
(let ((pos (point)))
|
|
|
|
(forward-comment (- (point)))
|
2013-10-05 18:37:08 +00:00
|
|
|
(cond
|
|
|
|
((and (> pos (line-end-position)) (ruby-smie--implicit-semi-p))
|
|
|
|
(skip-chars-forward " \t") ";")
|
2013-11-04 10:50:47 +00:00
|
|
|
((and (bolp) (not (bobp))) ;Presumably a heredoc.
|
|
|
|
;; Tokenize the whole heredoc as semicolon.
|
|
|
|
(goto-char (scan-sexps (point) -1))
|
|
|
|
";")
|
2013-10-12 20:40:50 +00:00
|
|
|
((and (> pos (point)) (not (bolp))
|
|
|
|
(ruby-smie--args-separator-p pos))
|
|
|
|
;; We have "ID SPC ID", which is a method call, but it binds less tightly
|
|
|
|
;; than commas, since a method call can also be "ID ARG1, ARG2, ARG3".
|
|
|
|
;; In some textbooks, "e1 @ e2" is used to mean "call e1 with arg e2".
|
|
|
|
" @ ")
|
2013-10-05 18:37:08 +00:00
|
|
|
(t
|
2013-10-21 22:25:59 +00:00
|
|
|
(let ((tok (smie-default-backward-token))
|
|
|
|
(dot (ruby-smie--at-dot-call)))
|
|
|
|
(when dot
|
2013-10-09 03:18:01 +00:00
|
|
|
(setq tok (concat "." tok)))
|
2013-08-29 18:06:46 +00:00
|
|
|
(when (and (eq ?: (char-before)) (string-match "\\`\\s." tok))
|
|
|
|
(forward-char -1) (setq tok (concat ":" tok))) ;; bug#15208.
|
2013-05-08 20:25:57 +00:00
|
|
|
(cond
|
|
|
|
((member tok '("unless" "if" "while" "until"))
|
|
|
|
(if (ruby-smie--bosp)
|
|
|
|
tok "iuwu-mod"))
|
2013-08-29 18:06:46 +00:00
|
|
|
((equal tok "|")
|
|
|
|
(if (ruby-smie--opening-pipe-p) "opening-|" tok))
|
2013-11-08 02:31:51 +00:00
|
|
|
((string-match-p "|[*&]" tok)
|
|
|
|
(forward-char 1)
|
|
|
|
(substring tok 1))
|
2013-10-05 18:37:08 +00:00
|
|
|
((and (equal tok "") (eq ?\\ (char-before)) (looking-at "\n"))
|
|
|
|
(forward-char -1) (ruby-smie--backward-token))
|
2013-10-07 03:38:26 +00:00
|
|
|
((equal tok "do")
|
|
|
|
(cond
|
|
|
|
((not (ruby-smie--redundant-do-p)) tok)
|
|
|
|
((> (save-excursion (forward-word 1)
|
|
|
|
(forward-comment (point-max)) (point))
|
|
|
|
(line-end-position))
|
|
|
|
(ruby-smie--backward-token)) ;Fully redundant.
|
|
|
|
(t ";")))
|
2013-10-05 18:37:08 +00:00
|
|
|
(t tok)))))))
|
2013-05-08 20:25:57 +00:00
|
|
|
|
2013-11-08 02:31:51 +00:00
|
|
|
(defun ruby-smie--indent-to-stmt ()
|
|
|
|
(save-excursion
|
|
|
|
(let (parent)
|
|
|
|
(while (not (or (eq (car parent) t)
|
|
|
|
(equal (nth 2 parent) ";")))
|
|
|
|
(setq parent (let (smie--parent) (smie-indent--parent)))
|
|
|
|
(when (numberp (nth 1 parent))
|
|
|
|
(goto-char (nth 1 parent))))
|
|
|
|
(cons 'column (smie-indent-virtual)))))
|
|
|
|
|
2013-05-08 20:25:57 +00:00
|
|
|
(defun ruby-smie-rules (kind token)
|
|
|
|
(pcase (cons kind token)
|
|
|
|
(`(:elem . basic) ruby-indent-level)
|
2013-10-05 18:37:08 +00:00
|
|
|
;; "foo" "bar" is the concatenation of the two strings, so the second
|
|
|
|
;; should be aligned with the first.
|
|
|
|
(`(:elem . args) (if (looking-at "\\s\"") 0))
|
|
|
|
;; (`(:after . ",") (smie-rule-separator kind))
|
2013-10-22 15:45:56 +00:00
|
|
|
(`(:before . ";")
|
2013-10-21 03:50:06 +00:00
|
|
|
(cond
|
|
|
|
((smie-rule-parent-p "def" "begin" "do" "class" "module" "for"
|
|
|
|
"while" "until" "unless"
|
|
|
|
"if" "then" "elsif" "else" "when"
|
2013-10-24 00:47:28 +00:00
|
|
|
"rescue" "ensure" "{")
|
2013-10-21 03:50:06 +00:00
|
|
|
(smie-rule-parent ruby-indent-level))
|
|
|
|
;; For (invalid) code between switch and case.
|
|
|
|
;; (if (smie-parent-p "switch") 4)
|
2013-10-23 17:18:11 +00:00
|
|
|
))
|
2013-10-05 18:37:08 +00:00
|
|
|
(`(:before . ,(or `"(" `"[" `"{"))
|
2013-10-21 03:50:06 +00:00
|
|
|
(cond
|
|
|
|
((and (equal token "{")
|
2013-11-08 02:31:51 +00:00
|
|
|
(not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";"))
|
|
|
|
(save-excursion
|
|
|
|
(forward-comment -1)
|
|
|
|
(not (eq (preceding-char) ?:))))
|
2013-10-21 03:50:06 +00:00
|
|
|
;; Curly block opener.
|
2013-11-08 02:31:51 +00:00
|
|
|
(ruby-smie--indent-to-stmt))
|
2013-10-21 03:50:06 +00:00
|
|
|
((smie-rule-hanging-p)
|
|
|
|
;; Treat purely syntactic block-constructs as being part of their parent,
|
|
|
|
;; when the opening statement is hanging.
|
|
|
|
(let ((state (smie-backward-sexp 'halfsexp)))
|
|
|
|
(when (eq t (car state)) (goto-char (cadr state))))
|
|
|
|
(cons 'column (smie-indent-virtual)))))
|
|
|
|
(`(:after . " @ ") (smie-rule-parent))
|
2013-11-08 02:31:51 +00:00
|
|
|
(`(:before . "do") (ruby-smie--indent-to-stmt))
|
2013-10-21 22:25:59 +00:00
|
|
|
(`(,(or :before :after) . ".")
|
|
|
|
(unless (smie-rule-parent-p ".")
|
|
|
|
(smie-rule-parent ruby-indent-level)))
|
2013-10-06 00:46:28 +00:00
|
|
|
(`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
|
2013-05-08 20:25:57 +00:00
|
|
|
(`(:before . ,(or `"when"))
|
|
|
|
(if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
|
2013-11-07 03:02:01 +00:00
|
|
|
(`(:after . ,(or "=" "iuwu-mod" "+" "-" "*" "/" "&&" "||" "%" "**" "^" "&"
|
|
|
|
"<=>" ">" "<" ">=" "<=" "==" "===" "!=" "<<" ">>"
|
|
|
|
"+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^="
|
|
|
|
"<<=" ">>=" "&&=" "||=" "and" "or"))
|
|
|
|
(if (smie-rule-parent-p ";" nil) ruby-indent-level))
|
2013-10-07 03:38:26 +00:00
|
|
|
))
|
2013-05-08 20:25:57 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defun ruby-imenu-create-index-in-block (prefix beg end)
|
|
|
|
"Create an imenu index of methods inside a block."
|
|
|
|
(let ((index-alist '()) (case-fold-search nil)
|
|
|
|
name next pos decl sing)
|
|
|
|
(goto-char beg)
|
|
|
|
(while (re-search-forward "^\\s *\\(\\(class\\s +\\|\\(class\\s *<<\\s *\\)\\|module\\s +\\)\\([^\(<\n ]+\\)\\|\\(def\\|alias\\)\\s +\\([^\(\n ]+\\)\\)" end t)
|
|
|
|
(setq sing (match-beginning 3))
|
|
|
|
(setq decl (match-string 5))
|
|
|
|
(setq next (match-end 0))
|
|
|
|
(setq name (or (match-string 4) (match-string 6)))
|
|
|
|
(setq pos (match-beginning 0))
|
|
|
|
(cond
|
|
|
|
((string= "alias" decl)
|
|
|
|
(if prefix (setq name (concat prefix name)))
|
|
|
|
(push (cons name pos) index-alist))
|
|
|
|
((string= "def" decl)
|
|
|
|
(if prefix
|
|
|
|
(setq name
|
|
|
|
(cond
|
|
|
|
((string-match "^self\." name)
|
|
|
|
(concat (substring prefix 0 -1) (substring name 4)))
|
|
|
|
(t (concat prefix name)))))
|
|
|
|
(push (cons name pos) index-alist)
|
|
|
|
(ruby-accurate-end-of-block end))
|
|
|
|
(t
|
|
|
|
(if (string= "self" name)
|
|
|
|
(if prefix (setq name (substring prefix 0 -1)))
|
|
|
|
(if prefix (setq name (concat (substring prefix 0 -1) "::" name)))
|
|
|
|
(push (cons name pos) index-alist))
|
|
|
|
(ruby-accurate-end-of-block end)
|
|
|
|
(setq beg (point))
|
|
|
|
(setq index-alist
|
|
|
|
(nconc (ruby-imenu-create-index-in-block
|
|
|
|
(concat name (if sing "." "#"))
|
|
|
|
next beg) index-alist))
|
|
|
|
(goto-char beg))))
|
|
|
|
index-alist))
|
|
|
|
|
|
|
|
(defun ruby-imenu-create-index ()
|
|
|
|
"Create an imenu index of all methods in the buffer."
|
|
|
|
(nreverse (ruby-imenu-create-index-in-block nil (point-min) nil)))
|
|
|
|
|
|
|
|
(defun ruby-accurate-end-of-block (&optional end)
|
|
|
|
"TODO: document."
|
|
|
|
(let (state
|
|
|
|
(end (or end (point-max))))
|
|
|
|
(while (and (setq state (apply 'ruby-parse-partial end state))
|
|
|
|
(>= (nth 2 state) 0) (< (point) end)))))
|
|
|
|
|
|
|
|
(defun ruby-mode-variables ()
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Set up initial buffer-local variables for Ruby mode."
|
2008-12-10 18:59:26 +00:00
|
|
|
(setq indent-tabs-mode ruby-indent-tabs-mode)
|
2013-05-08 20:25:57 +00:00
|
|
|
(if ruby-use-smie
|
|
|
|
(smie-setup ruby-smie-grammar #'ruby-smie-rules
|
|
|
|
:forward-token #'ruby-smie--forward-token
|
|
|
|
:backward-token #'ruby-smie--backward-token)
|
2013-11-02 00:17:54 +00:00
|
|
|
(setq-local indent-line-function 'ruby-indent-line))
|
|
|
|
(setq-local require-final-newline t)
|
|
|
|
(setq-local comment-start "# ")
|
|
|
|
(setq-local comment-end "")
|
|
|
|
(setq-local comment-column ruby-comment-column)
|
|
|
|
(setq-local comment-start-skip "#+ *")
|
|
|
|
(setq-local parse-sexp-ignore-comments t)
|
|
|
|
(setq-local parse-sexp-lookup-properties t)
|
|
|
|
(setq-local paragraph-start (concat "$\\|" page-delimiter))
|
|
|
|
(setq-local paragraph-separate paragraph-start)
|
|
|
|
(setq-local paragraph-ignore-fill-prefix t))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-mode-set-encoding ()
|
|
|
|
"Insert a magic comment header with the proper encoding if necessary."
|
|
|
|
(save-excursion
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward "[^\0-\177]" nil t)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((coding-system
|
2013-10-13 21:35:31 +00:00
|
|
|
(or save-buffer-coding-system
|
2013-10-05 17:21:22 +00:00
|
|
|
buffer-file-coding-system)))
|
|
|
|
(if coding-system
|
|
|
|
(setq coding-system
|
|
|
|
(or (coding-system-get coding-system 'mime-charset)
|
|
|
|
(coding-system-change-eol-conversion coding-system nil))))
|
2008-12-10 18:59:26 +00:00
|
|
|
(setq coding-system
|
2013-10-05 17:21:22 +00:00
|
|
|
(if coding-system
|
|
|
|
(symbol-name
|
2013-10-14 00:23:29 +00:00
|
|
|
(if ruby-use-encoding-map
|
|
|
|
(let ((elt (assq coding-system ruby-encoding-map)))
|
|
|
|
(if elt (cdr elt) coding-system))
|
|
|
|
coding-system))
|
2013-10-05 17:21:22 +00:00
|
|
|
"ascii-8bit"))
|
2013-10-14 00:23:29 +00:00
|
|
|
(when coding-system
|
|
|
|
(if (looking-at "^#!") (beginning-of-line 2))
|
|
|
|
(cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)")
|
|
|
|
(unless (string= (match-string 2) coding-system)
|
|
|
|
(goto-char (match-beginning 2))
|
|
|
|
(delete-region (point) (match-end 2))
|
|
|
|
(and (looking-at "-\*-")
|
|
|
|
(let ((n (skip-chars-backward " ")))
|
|
|
|
(cond ((= n 0) (insert " ") (backward-char))
|
|
|
|
((= n -1) (insert " "))
|
|
|
|
((forward-char)))))
|
|
|
|
(insert coding-system)))
|
|
|
|
((looking-at "\\s *#.*coding\\s *[:=]"))
|
|
|
|
(t (when ruby-insert-encoding-magic-comment
|
|
|
|
(insert "# -*- coding: " coding-system " -*-\n"))))
|
|
|
|
(when (buffer-modified-p)
|
|
|
|
(basic-save-buffer-1)))))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-current-indentation ()
|
|
|
|
"Return the indentation level of current line."
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
|
|
|
(back-to-indentation)
|
|
|
|
(current-column)))
|
|
|
|
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(defun ruby-indent-line (&optional ignored)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Correct the indentation of the current Ruby line."
|
2008-12-10 18:59:26 +00:00
|
|
|
(interactive)
|
|
|
|
(ruby-indent-to (ruby-calculate-indent)))
|
|
|
|
|
|
|
|
(defun ruby-indent-to (column)
|
|
|
|
"Indent the current line to COLUMN."
|
|
|
|
(when column
|
|
|
|
(let (shift top beg)
|
2013-11-05 16:28:40 +00:00
|
|
|
(and (< column 0) (error "Invalid nesting"))
|
2008-12-10 18:59:26 +00:00
|
|
|
(setq shift (current-column))
|
|
|
|
(beginning-of-line)
|
|
|
|
(setq beg (point))
|
|
|
|
(back-to-indentation)
|
|
|
|
(setq top (current-column))
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(if (>= shift top) (setq shift (- shift top))
|
|
|
|
(setq shift 0))
|
|
|
|
(if (and (bolp)
|
|
|
|
(= column top))
|
|
|
|
(move-to-column (+ column shift))
|
|
|
|
(move-to-column top)
|
|
|
|
(delete-region beg (point))
|
|
|
|
(beginning-of-line)
|
|
|
|
(indent-to column)
|
|
|
|
(move-to-column (+ column shift))))))
|
|
|
|
|
|
|
|
(defun ruby-special-char-p (&optional pos)
|
|
|
|
"Return t if the character before POS is a special character.
|
|
|
|
If omitted, POS defaults to the current point.
|
|
|
|
Special characters are `?', `$', `:' when preceded by whitespace,
|
|
|
|
and `\\' when preceded by `?'."
|
|
|
|
(setq pos (or pos (point)))
|
|
|
|
(let ((c (char-before pos)) (b (and (< (point-min) pos)
|
|
|
|
(char-before (1- pos)))))
|
|
|
|
(cond ((or (eq c ??) (eq c ?$)))
|
|
|
|
((and (eq c ?:) (or (not b) (eq (char-syntax b) ? ))))
|
|
|
|
((eq c ?\\) (eq b ??)))))
|
|
|
|
|
2012-08-10 20:19:09 +00:00
|
|
|
(defun ruby-singleton-class-p (&optional pos)
|
|
|
|
(save-excursion
|
|
|
|
(when pos (goto-char pos))
|
|
|
|
(forward-word -1)
|
|
|
|
(and (or (bolp) (not (eq (char-before (point)) ?_)))
|
2012-12-14 06:58:15 +00:00
|
|
|
(looking-at ruby-singleton-class-re))))
|
2012-08-10 20:19:09 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defun ruby-expr-beg (&optional option)
|
2012-11-14 06:34:17 +00:00
|
|
|
"Check if point is possibly at the beginning of an expression.
|
|
|
|
OPTION specifies the type of the expression.
|
|
|
|
Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
|
2008-12-10 18:59:26 +00:00
|
|
|
(save-excursion
|
|
|
|
(store-match-data nil)
|
2012-08-10 20:19:09 +00:00
|
|
|
(let ((space (skip-chars-backward " \t"))
|
|
|
|
(start (point)))
|
2008-12-10 18:59:26 +00:00
|
|
|
(cond
|
|
|
|
((bolp) t)
|
|
|
|
((progn
|
|
|
|
(forward-char -1)
|
|
|
|
(and (looking-at "\\?")
|
|
|
|
(or (eq (char-syntax (char-before (point))) ?w)
|
|
|
|
(ruby-special-char-p))))
|
|
|
|
nil)
|
2012-11-14 06:34:17 +00:00
|
|
|
((looking-at ruby-operator-re))
|
|
|
|
((eq option 'heredoc)
|
|
|
|
(and (< space 0) (not (ruby-singleton-class-p start))))
|
|
|
|
((or (looking-at "[\\[({,;]")
|
2008-12-10 18:59:26 +00:00
|
|
|
(and (looking-at "[!?]")
|
|
|
|
(or (not (eq option 'modifier))
|
|
|
|
(bolp)
|
|
|
|
(save-excursion (forward-char -1) (looking-at "\\Sw$"))))
|
|
|
|
(and (looking-at ruby-symbol-re)
|
|
|
|
(skip-chars-backward ruby-symbol-chars)
|
|
|
|
(cond
|
|
|
|
((looking-at (regexp-opt
|
|
|
|
(append ruby-block-beg-keywords
|
|
|
|
ruby-block-op-keywords
|
|
|
|
ruby-block-mid-keywords)
|
|
|
|
'words))
|
|
|
|
(goto-char (match-end 0))
|
2012-08-10 20:19:09 +00:00
|
|
|
(not (looking-at "\\s_\\|!")))
|
2008-12-10 18:59:26 +00:00
|
|
|
((eq option 'expr-qstr)
|
|
|
|
(looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
|
|
|
|
((eq option 'expr-re)
|
|
|
|
(looking-at "[a-zA-Z][a-zA-z0-9_]* +/[^ \t]"))
|
|
|
|
(t nil)))))))))
|
|
|
|
|
|
|
|
(defun ruby-forward-string (term &optional end no-error expand)
|
|
|
|
"TODO: document."
|
|
|
|
(let ((n 1) (c (string-to-char term))
|
|
|
|
(re (if expand
|
|
|
|
(concat "[^\\]\\(\\\\\\\\\\)*\\([" term "]\\|\\(#{\\)\\)")
|
|
|
|
(concat "[^\\]\\(\\\\\\\\\\)*[" term "]"))))
|
|
|
|
(while (and (re-search-forward re end no-error)
|
|
|
|
(if (match-beginning 3)
|
|
|
|
(ruby-forward-string "}{" end no-error nil)
|
|
|
|
(> (setq n (if (eq (char-before (point)) c)
|
|
|
|
(1- n) (1+ n))) 0)))
|
|
|
|
(forward-char -1))
|
|
|
|
(cond ((zerop n))
|
|
|
|
(no-error nil)
|
2013-11-05 16:28:40 +00:00
|
|
|
((error "Unterminated string")))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-deep-indent-paren-p (c)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"TODO: document."
|
2008-12-10 18:59:26 +00:00
|
|
|
(cond ((listp ruby-deep-indent-paren)
|
|
|
|
(let ((deep (assoc c ruby-deep-indent-paren)))
|
|
|
|
(cond (deep
|
|
|
|
(or (cdr deep) ruby-deep-indent-paren-style))
|
|
|
|
((memq c ruby-deep-indent-paren)
|
|
|
|
ruby-deep-indent-paren-style))))
|
|
|
|
((eq c ruby-deep-indent-paren) ruby-deep-indent-paren-style)
|
|
|
|
((eq c ?\( ) ruby-deep-arglist)))
|
|
|
|
|
|
|
|
(defun ruby-parse-partial (&optional end in-string nest depth pcol indent)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"TODO: document throughout function body."
|
2008-12-10 18:59:26 +00:00
|
|
|
(or depth (setq depth 0))
|
|
|
|
(or indent (setq indent 0))
|
|
|
|
(when (re-search-forward ruby-delimiter end 'move)
|
|
|
|
(let ((pnt (point)) w re expand)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(cond
|
|
|
|
((and (memq (char-before) '(?@ ?$)) (looking-at "\\sw"))
|
|
|
|
(goto-char pnt))
|
|
|
|
((looking-at "[\"`]") ;skip string
|
|
|
|
(cond
|
|
|
|
((and (not (eobp))
|
|
|
|
(ruby-forward-string (buffer-substring (point) (1+ (point))) end t t))
|
|
|
|
nil)
|
|
|
|
(t
|
|
|
|
(setq in-string (point))
|
|
|
|
(goto-char end))))
|
|
|
|
((looking-at "'")
|
|
|
|
(cond
|
|
|
|
((and (not (eobp))
|
|
|
|
(re-search-forward "[^\\]\\(\\\\\\\\\\)*'" end t))
|
|
|
|
nil)
|
|
|
|
(t
|
|
|
|
(setq in-string (point))
|
|
|
|
(goto-char end))))
|
|
|
|
((looking-at "/=")
|
|
|
|
(goto-char pnt))
|
|
|
|
((looking-at "/")
|
|
|
|
(cond
|
|
|
|
((and (not (eobp)) (ruby-expr-beg 'expr-re))
|
|
|
|
(if (ruby-forward-string "/" end t t)
|
|
|
|
nil
|
|
|
|
(setq in-string (point))
|
|
|
|
(goto-char end)))
|
|
|
|
(t
|
|
|
|
(goto-char pnt))))
|
|
|
|
((looking-at "%")
|
|
|
|
(cond
|
|
|
|
((and (not (eobp))
|
|
|
|
(ruby-expr-beg 'expr-qstr)
|
|
|
|
(not (looking-at "%="))
|
|
|
|
(looking-at "%[QqrxWw]?\\([^a-zA-Z0-9 \t\n]\\)"))
|
|
|
|
(goto-char (match-beginning 1))
|
|
|
|
(setq expand (not (memq (char-before) '(?q ?w))))
|
|
|
|
(setq w (match-string 1))
|
|
|
|
(cond
|
|
|
|
((string= w "[") (setq re "]["))
|
|
|
|
((string= w "{") (setq re "}{"))
|
|
|
|
((string= w "(") (setq re ")("))
|
|
|
|
((string= w "<") (setq re "><"))
|
|
|
|
((and expand (string= w "\\"))
|
|
|
|
(setq w (concat "\\" w))))
|
|
|
|
(unless (cond (re (ruby-forward-string re end t expand))
|
|
|
|
(expand (ruby-forward-string w end t t))
|
|
|
|
(t (re-search-forward
|
|
|
|
(if (string= w "\\")
|
|
|
|
"\\\\[^\\]*\\\\"
|
|
|
|
(concat "[^\\]\\(\\\\\\\\\\)*" w))
|
|
|
|
end t)))
|
|
|
|
(setq in-string (point))
|
|
|
|
(goto-char end)))
|
|
|
|
(t
|
|
|
|
(goto-char pnt))))
|
|
|
|
((looking-at "\\?") ;skip ?char
|
|
|
|
(cond
|
|
|
|
((and (ruby-expr-beg)
|
|
|
|
(looking-at "?\\(\\\\C-\\|\\\\M-\\)*\\\\?."))
|
|
|
|
(goto-char (match-end 0)))
|
|
|
|
(t
|
|
|
|
(goto-char pnt))))
|
|
|
|
((looking-at "\\$") ;skip $char
|
|
|
|
(goto-char pnt)
|
|
|
|
(forward-char 1))
|
|
|
|
((looking-at "#") ;skip comment
|
|
|
|
(forward-line 1)
|
|
|
|
(goto-char (point))
|
|
|
|
)
|
|
|
|
((looking-at "[\\[{(]")
|
|
|
|
(let ((deep (ruby-deep-indent-paren-p (char-after))))
|
|
|
|
(if (and deep (or (not (eq (char-after) ?\{)) (ruby-expr-beg)))
|
|
|
|
(progn
|
|
|
|
(and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
|
|
|
|
(setq pnt (1- (match-end 0))))
|
|
|
|
(setq nest (cons (cons (char-after (point)) pnt) nest))
|
|
|
|
(setq pcol (cons (cons pnt depth) pcol))
|
|
|
|
(setq depth 0))
|
|
|
|
(setq nest (cons (cons (char-after (point)) pnt) nest))
|
|
|
|
(setq depth (1+ depth))))
|
|
|
|
(goto-char pnt)
|
|
|
|
)
|
|
|
|
((looking-at "[])}]")
|
|
|
|
(if (ruby-deep-indent-paren-p (matching-paren (char-after)))
|
|
|
|
(setq depth (cdr (car pcol)) pcol (cdr pcol))
|
|
|
|
(setq depth (1- depth)))
|
|
|
|
(setq nest (cdr nest))
|
|
|
|
(goto-char pnt))
|
|
|
|
((looking-at ruby-block-end-re)
|
|
|
|
(if (or (and (not (bolp))
|
|
|
|
(progn
|
|
|
|
(forward-char -1)
|
|
|
|
(setq w (char-after (point)))
|
|
|
|
(or (eq ?_ w)
|
|
|
|
(eq ?. w))))
|
|
|
|
(progn
|
|
|
|
(goto-char pnt)
|
|
|
|
(setq w (char-after (point)))
|
|
|
|
(or (eq ?_ w)
|
|
|
|
(eq ?! w)
|
|
|
|
(eq ?? w))))
|
|
|
|
nil
|
|
|
|
(setq nest (cdr nest))
|
|
|
|
(setq depth (1- depth)))
|
|
|
|
(goto-char pnt))
|
|
|
|
((looking-at "def\\s +[^(\n;]*")
|
|
|
|
(if (or (bolp)
|
|
|
|
(progn
|
|
|
|
(forward-char -1)
|
|
|
|
(not (eq ?_ (char-after (point))))))
|
|
|
|
(progn
|
|
|
|
(setq nest (cons (cons nil pnt) nest))
|
|
|
|
(setq depth (1+ depth))))
|
|
|
|
(goto-char (match-end 0)))
|
2012-03-21 18:33:07 +00:00
|
|
|
((looking-at (concat "\\_<\\(" ruby-block-beg-re "\\)\\_>"))
|
2008-12-10 18:59:26 +00:00
|
|
|
(and
|
|
|
|
(save-match-data
|
2013-07-16 19:16:51 +00:00
|
|
|
(or (not (looking-at "do\\_>"))
|
2008-12-10 18:59:26 +00:00
|
|
|
(save-excursion
|
|
|
|
(back-to-indentation)
|
|
|
|
(not (looking-at ruby-non-block-do-re)))))
|
|
|
|
(or (bolp)
|
|
|
|
(progn
|
|
|
|
(forward-char -1)
|
|
|
|
(setq w (char-after (point)))
|
|
|
|
(not (or (eq ?_ w)
|
|
|
|
(eq ?. w)))))
|
|
|
|
(goto-char pnt)
|
2013-02-13 08:15:05 +00:00
|
|
|
(not (eq ?! (char-after (point))))
|
2008-12-10 18:59:26 +00:00
|
|
|
(skip-chars-forward " \t")
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(or (not (looking-at ruby-modifier-re))
|
|
|
|
(ruby-expr-beg 'modifier))
|
|
|
|
(goto-char pnt)
|
|
|
|
(setq nest (cons (cons nil pnt) nest))
|
|
|
|
(setq depth (1+ depth)))
|
|
|
|
(goto-char pnt))
|
|
|
|
((looking-at ":\\(['\"]\\)")
|
|
|
|
(goto-char (match-beginning 1))
|
2012-07-20 11:10:25 +00:00
|
|
|
(ruby-forward-string (match-string 1) end t))
|
2009-06-17 15:16:17 +00:00
|
|
|
((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\|![~=]?\\)")
|
2008-12-10 18:59:26 +00:00
|
|
|
(goto-char (match-end 0)))
|
|
|
|
((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
|
|
|
|
(goto-char (match-end 0)))
|
|
|
|
((or (looking-at "\\.\\.\\.?")
|
|
|
|
(looking-at "\\.[0-9]+")
|
|
|
|
(looking-at "\\.[a-zA-Z_0-9]+")
|
|
|
|
(looking-at "\\."))
|
|
|
|
(goto-char (match-end 0)))
|
|
|
|
((looking-at "^=begin")
|
|
|
|
(if (re-search-forward "^=end" end t)
|
|
|
|
(forward-line 1)
|
|
|
|
(setq in-string (match-end 0))
|
|
|
|
(goto-char end)))
|
|
|
|
((looking-at "<<")
|
|
|
|
(cond
|
|
|
|
((and (ruby-expr-beg 'heredoc)
|
|
|
|
(looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)"))
|
|
|
|
(setq re (regexp-quote (or (match-string 4) (match-string 2))))
|
|
|
|
(if (match-beginning 1) (setq re (concat "\\s *" re)))
|
|
|
|
(let* ((id-end (goto-char (match-end 0)))
|
Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
* lisp/mh-e/mh-seq.el (mh-read-msg-list): Use point-at-eol.
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
(gnus-bookmark-kill-line): Use point-at-eol.
* lisp/cedet/ede/proj-elisp.el (ede-proj-flush-autoconf): Use point-at-bol.
* lisp/emacs-lisp/chart.el (chart-zap-chars):
* lisp/play/decipher.el (decipher-set-map):
* lisp/progmodes/ada-mode.el (ada-get-current-indent)
(ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
* lisp/progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library)
(ada-get-all-references):
* lisp/progmodes/cperl-mode.el (cperl-electric-paren)
(cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
(cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
(cperl-word-at-point-hard):
* lisp/progmodes/idlw-shell.el (idlwave-shell-move-or-history)
(idlwave-shell-filename-string, idlwave-shell-batch-command)
(idlwave-shell-display-line):
* lisp/progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
(idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
* lisp/progmodes/js.el (js--re-search-forward-inner)
(js--re-search-backward-inner):
* lisp/progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
(vhdl-fix-clause, vhdl-compose-configuration-architecture):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
* lisp/textmodes/flyspell.el (flyspell-process-localwords):
* lisp/textmodes/ispell.el (ispell-buffer-local-parsing)
(ispell-buffer-local-dict, ispell-buffer-local-words):
Use point-at-bol and point-at-eol.
2010-11-07 01:36:33 +00:00
|
|
|
(line-end-position (point-at-eol))
|
2008-12-10 18:59:26 +00:00
|
|
|
(state (list in-string nest depth pcol indent)))
|
|
|
|
;; parse the rest of the line
|
|
|
|
(while (and (> line-end-position (point))
|
|
|
|
(setq state (apply 'ruby-parse-partial
|
|
|
|
line-end-position state))))
|
|
|
|
(setq in-string (car state)
|
|
|
|
nest (nth 1 state)
|
|
|
|
depth (nth 2 state)
|
|
|
|
pcol (nth 3 state)
|
|
|
|
indent (nth 4 state))
|
|
|
|
;; skip heredoc section
|
|
|
|
(if (re-search-forward (concat "^" re "$") end 'move)
|
|
|
|
(forward-line 1)
|
|
|
|
(setq in-string id-end)
|
|
|
|
(goto-char end))))
|
|
|
|
(t
|
|
|
|
(goto-char pnt))))
|
|
|
|
((looking-at "^__END__$")
|
|
|
|
(goto-char pnt))
|
|
|
|
((and (looking-at ruby-here-doc-beg-re)
|
|
|
|
(boundp 'ruby-indent-point))
|
|
|
|
(if (re-search-forward (ruby-here-doc-end-match)
|
|
|
|
ruby-indent-point t)
|
|
|
|
(forward-line 1)
|
|
|
|
(setq in-string (match-end 0))
|
|
|
|
(goto-char ruby-indent-point)))
|
|
|
|
(t
|
2013-11-05 16:28:40 +00:00
|
|
|
(error (format "Bad string %s"
|
2008-12-10 18:59:26 +00:00
|
|
|
(buffer-substring (point) pnt)
|
|
|
|
))))))
|
|
|
|
(list in-string nest depth pcol))
|
|
|
|
|
|
|
|
(defun ruby-parse-region (start end)
|
|
|
|
"TODO: document."
|
|
|
|
(let (state)
|
|
|
|
(save-excursion
|
|
|
|
(if start
|
|
|
|
(goto-char start)
|
|
|
|
(ruby-beginning-of-indent))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) end)
|
|
|
|
(while (and (> end (point))
|
|
|
|
(setq state (apply 'ruby-parse-partial end state))))))
|
|
|
|
(list (nth 0 state) ; in-string
|
|
|
|
(car (nth 1 state)) ; nest
|
|
|
|
(nth 2 state) ; depth
|
|
|
|
(car (car (nth 3 state))) ; pcol
|
|
|
|
;(car (nth 5 state)) ; indent
|
|
|
|
)))
|
|
|
|
|
|
|
|
(defun ruby-indent-size (pos nest)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Return the indentation level in spaces NEST levels deeper than POS."
|
2008-12-10 18:59:26 +00:00
|
|
|
(+ pos (* (or nest 1) ruby-indent-level)))
|
|
|
|
|
|
|
|
(defun ruby-calculate-indent (&optional parse-start)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Return the proper indentation level of the current line."
|
2008-12-10 18:59:26 +00:00
|
|
|
;; TODO: Document body
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
|
|
|
(let ((ruby-indent-point (point))
|
|
|
|
(case-fold-search nil)
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
state eol begin op-end
|
2008-12-10 18:59:26 +00:00
|
|
|
(paren (progn (skip-syntax-forward " ")
|
|
|
|
(and (char-after) (matching-paren (char-after)))))
|
|
|
|
(indent 0))
|
|
|
|
(if parse-start
|
|
|
|
(goto-char parse-start)
|
|
|
|
(ruby-beginning-of-indent)
|
|
|
|
(setq parse-start (point)))
|
|
|
|
(back-to-indentation)
|
|
|
|
(setq indent (current-column))
|
|
|
|
(setq state (ruby-parse-region parse-start ruby-indent-point))
|
|
|
|
(cond
|
|
|
|
((nth 0 state) ; within string
|
|
|
|
(setq indent nil)) ; do nothing
|
|
|
|
((car (nth 1 state)) ; in paren
|
|
|
|
(goto-char (setq begin (cdr (nth 1 state))))
|
|
|
|
(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
|
|
|
|
(if deep
|
|
|
|
(cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
|
|
|
|
(skip-syntax-backward " ")
|
|
|
|
(setq indent (1- (current-column))))
|
|
|
|
((let ((s (ruby-parse-region (point) ruby-indent-point)))
|
|
|
|
(and (nth 2 s) (> (nth 2 s) 0)
|
|
|
|
(or (goto-char (cdr (nth 1 s))) t)))
|
|
|
|
(forward-word -1)
|
|
|
|
(setq indent (ruby-indent-size (current-column)
|
|
|
|
(nth 2 state))))
|
|
|
|
(t
|
|
|
|
(setq indent (current-column))
|
|
|
|
(cond ((eq deep 'space))
|
|
|
|
(paren (setq indent (1- indent)))
|
|
|
|
(t (setq indent (ruby-indent-size (1- indent) 1))))))
|
|
|
|
(if (nth 3 state) (goto-char (nth 3 state))
|
|
|
|
(goto-char parse-start) (back-to-indentation))
|
|
|
|
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
|
|
|
|
(and (eq (car (nth 1 state)) paren)
|
|
|
|
(ruby-deep-indent-paren-p (matching-paren paren))
|
|
|
|
(search-backward (char-to-string paren))
|
|
|
|
(setq indent (current-column)))))
|
|
|
|
((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
|
|
|
|
(if (null (cdr (nth 1 state)))
|
2013-11-05 16:28:40 +00:00
|
|
|
(error "Invalid nesting"))
|
2008-12-10 18:59:26 +00:00
|
|
|
(goto-char (cdr (nth 1 state)))
|
|
|
|
(forward-word -1) ; skip back a keyword
|
|
|
|
(setq begin (point))
|
|
|
|
(cond
|
|
|
|
((looking-at "do\\>[^_]") ; iter block is a special case
|
|
|
|
(if (nth 3 state) (goto-char (nth 3 state))
|
|
|
|
(goto-char parse-start) (back-to-indentation))
|
|
|
|
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
|
|
|
|
(t
|
|
|
|
(setq indent (+ (current-column) ruby-indent-level)))))
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
|
|
|
|
(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
|
|
|
|
(when indent
|
|
|
|
(goto-char ruby-indent-point)
|
|
|
|
(end-of-line)
|
|
|
|
(setq eol (point))
|
|
|
|
(beginning-of-line)
|
|
|
|
(cond
|
|
|
|
((and (not (ruby-deep-indent-paren-p paren))
|
|
|
|
(re-search-forward ruby-negative eol t))
|
|
|
|
(and (not (eq ?_ (char-after (match-end 0))))
|
|
|
|
(setq indent (- indent ruby-indent-level))))
|
|
|
|
((and
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
|
|
|
(not (bobp)))
|
|
|
|
(or (ruby-deep-indent-paren-p t)
|
|
|
|
(null (car (nth 1 state)))))
|
|
|
|
;; goto beginning of non-empty no-comment line
|
|
|
|
(let (end done)
|
|
|
|
(while (not done)
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(setq end (point))
|
|
|
|
(beginning-of-line)
|
|
|
|
(if (re-search-forward "^\\s *#" end t)
|
|
|
|
(beginning-of-line)
|
|
|
|
(setq done t))))
|
|
|
|
(end-of-line)
|
|
|
|
;; skip the comment at the end
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(let (end (pos (point)))
|
|
|
|
(beginning-of-line)
|
|
|
|
(while (and (re-search-forward "#" pos t)
|
|
|
|
(setq end (1- (point)))
|
|
|
|
(or (ruby-special-char-p end)
|
|
|
|
(and (setq state (ruby-parse-region parse-start end))
|
|
|
|
(nth 0 state))))
|
|
|
|
(setq end nil))
|
|
|
|
(goto-char (or end pos))
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(setq begin (if (and end (nth 0 state)) pos (cdr (nth 1 state))))
|
|
|
|
(setq state (ruby-parse-region parse-start (point))))
|
|
|
|
(or (bobp) (forward-char -1))
|
|
|
|
(and
|
|
|
|
(or (and (looking-at ruby-symbol-re)
|
|
|
|
(skip-chars-backward ruby-symbol-chars)
|
|
|
|
(looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))
|
|
|
|
(not (eq (point) (nth 3 state)))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(not (looking-at "[a-z_]"))))
|
|
|
|
(and (looking-at ruby-operator-re)
|
|
|
|
(not (ruby-special-char-p))
|
2013-09-03 00:29:10 +00:00
|
|
|
(save-excursion
|
|
|
|
(forward-char -1)
|
|
|
|
(or (not (looking-at ruby-operator-re))
|
|
|
|
(not (eq (char-before) ?:))))
|
2012-04-24 17:06:12 +00:00
|
|
|
;; Operator at the end of line.
|
2008-12-10 18:59:26 +00:00
|
|
|
(let ((c (char-after (point))))
|
|
|
|
(and
|
|
|
|
;; (or (null begin)
|
|
|
|
;; (save-excursion
|
|
|
|
;; (goto-char begin)
|
|
|
|
;; (skip-chars-forward " \t")
|
|
|
|
;; (not (or (eolp) (looking-at "#")
|
|
|
|
;; (and (eq (car (nth 1 state)) ?{)
|
|
|
|
;; (looking-at "|"))))))
|
2012-08-14 12:28:12 +00:00
|
|
|
;; Not a regexp or percent literal.
|
2012-04-24 17:06:12 +00:00
|
|
|
(null (nth 0 (ruby-parse-region (or begin parse-start)
|
|
|
|
(point))))
|
2008-12-10 18:59:26 +00:00
|
|
|
(or (not (eq ?| (char-after (point))))
|
|
|
|
(save-excursion
|
|
|
|
(or (eolp) (forward-char -1))
|
|
|
|
(cond
|
|
|
|
((search-backward "|" nil t)
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
(and (not (eolp))
|
|
|
|
(progn
|
|
|
|
(forward-char -1)
|
|
|
|
(not (looking-at "{")))
|
|
|
|
(progn
|
|
|
|
(forward-word -1)
|
|
|
|
(not (looking-at "do\\>[^_]")))))
|
|
|
|
(t t))))
|
|
|
|
(not (eq ?, c))
|
|
|
|
(setq op-end t)))))
|
|
|
|
(setq indent
|
|
|
|
(cond
|
|
|
|
((and
|
|
|
|
(null op-end)
|
|
|
|
(not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")))
|
|
|
|
(eq (ruby-deep-indent-paren-p t) 'space)
|
|
|
|
(not (bobp)))
|
|
|
|
(widen)
|
|
|
|
(goto-char (or begin parse-start))
|
|
|
|
(skip-syntax-forward " ")
|
|
|
|
(current-column))
|
|
|
|
((car (nth 1 state)) indent)
|
|
|
|
(t
|
|
|
|
(+ indent ruby-indent-level))))))))
|
|
|
|
(goto-char ruby-indent-point)
|
|
|
|
(beginning-of-line)
|
|
|
|
(skip-syntax-forward " ")
|
|
|
|
(if (looking-at "\\.[^.]")
|
|
|
|
(+ indent ruby-indent-level)
|
|
|
|
indent))))
|
|
|
|
|
|
|
|
(defun ruby-beginning-of-defun (&optional arg)
|
2013-04-15 23:07:14 +00:00
|
|
|
"Move backward to the beginning of the current defun.
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
With ARG, move backward multiple defuns. Negative ARG means
|
2008-12-10 18:59:26 +00:00
|
|
|
move forward."
|
|
|
|
(interactive "p")
|
2013-04-15 23:07:14 +00:00
|
|
|
(let (case-fold-search)
|
|
|
|
(and (re-search-backward (concat "^\\s *" ruby-defun-beg-re "\\_>")
|
|
|
|
nil t (or arg 1))
|
|
|
|
(beginning-of-line))))
|
|
|
|
|
|
|
|
(defun ruby-end-of-defun ()
|
|
|
|
"Move point to the end of the current defun.
|
|
|
|
The defun begins at or after the point. This function is called
|
|
|
|
by `end-of-defun'."
|
2008-12-10 18:59:26 +00:00
|
|
|
(interactive "p")
|
2012-09-07 05:06:05 +00:00
|
|
|
(ruby-forward-sexp)
|
2013-04-15 23:07:14 +00:00
|
|
|
(let (case-fold-search)
|
|
|
|
(when (looking-back (concat "^\\s *" ruby-block-end-re))
|
|
|
|
(forward-line 1))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-beginning-of-indent ()
|
2012-09-07 04:15:56 +00:00
|
|
|
"Backtrack to a line which can be used as a reference for
|
|
|
|
calculating indentation on the lines after it."
|
|
|
|
(while (and (re-search-backward ruby-indent-beg-re nil 'move)
|
|
|
|
(if (ruby-in-ppss-context-p 'anything)
|
|
|
|
t
|
|
|
|
;; We can stop, then.
|
|
|
|
(beginning-of-line)))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-move-to-block (n)
|
2012-11-13 18:57:26 +00:00
|
|
|
"Move to the beginning (N < 0) or the end (N > 0) of the
|
|
|
|
current block, a sibling block, or an outer block. Do that (abs N) times."
|
2013-07-03 01:02:18 +00:00
|
|
|
(back-to-indentation)
|
2013-02-13 08:15:05 +00:00
|
|
|
(let ((signum (if (> n 0) 1 -1))
|
2012-11-13 18:57:26 +00:00
|
|
|
(backward (< n 0))
|
2013-07-03 01:02:18 +00:00
|
|
|
(depth (or (nth 2 (ruby-parse-region (point) (line-end-position))) 0))
|
2013-04-15 23:07:14 +00:00
|
|
|
case-fold-search
|
2013-02-13 08:15:05 +00:00
|
|
|
down done)
|
2013-07-03 01:02:18 +00:00
|
|
|
(when (looking-at ruby-block-mid-re)
|
|
|
|
(setq depth (+ depth signum)))
|
2013-02-13 08:15:05 +00:00
|
|
|
(when (< (* depth signum) 0)
|
|
|
|
;; Moving end -> end or beginning -> beginning.
|
|
|
|
(setq depth 0))
|
2012-11-13 18:57:26 +00:00
|
|
|
(dotimes (_ (abs n))
|
|
|
|
(setq done nil)
|
|
|
|
(setq down (save-excursion
|
|
|
|
(back-to-indentation)
|
|
|
|
;; There is a block start or block end keyword on this
|
|
|
|
;; line, don't need to look for another block.
|
|
|
|
(and (re-search-forward
|
|
|
|
(if backward ruby-block-end-re
|
|
|
|
(concat "\\_<\\(" ruby-block-beg-re "\\)\\_>"))
|
|
|
|
(line-end-position) t)
|
|
|
|
(not (nth 8 (syntax-ppss))))))
|
|
|
|
(while (and (not done) (not (if backward (bobp) (eobp))))
|
|
|
|
(forward-line signum)
|
2008-12-10 18:59:26 +00:00
|
|
|
(cond
|
2012-11-13 18:57:26 +00:00
|
|
|
;; Skip empty and commented out lines.
|
|
|
|
((looking-at "^\\s *$"))
|
|
|
|
((looking-at "^\\s *#"))
|
|
|
|
;; Skip block comments;
|
|
|
|
((and (not backward) (looking-at "^=begin\\>"))
|
|
|
|
(re-search-forward "^=end\\>"))
|
|
|
|
((and backward (looking-at "^=end\\>"))
|
|
|
|
(re-search-backward "^=begin\\>"))
|
2013-02-14 03:33:55 +00:00
|
|
|
;; Jump over a multiline literal.
|
|
|
|
((ruby-in-ppss-context-p 'string)
|
|
|
|
(goto-char (nth 8 (syntax-ppss)))
|
|
|
|
(unless backward
|
|
|
|
(forward-sexp)
|
|
|
|
(when (bolp) (forward-char -1)))) ; After a heredoc.
|
2012-11-13 18:57:26 +00:00
|
|
|
(t
|
2013-02-14 03:33:55 +00:00
|
|
|
(let ((state (ruby-parse-region (point) (line-end-position))))
|
|
|
|
(unless (car state) ; Line ends with unfinished string.
|
|
|
|
(setq depth (+ (nth 2 state) depth))))
|
2012-11-13 18:57:26 +00:00
|
|
|
(cond
|
2013-07-03 01:02:18 +00:00
|
|
|
;; Increased depth, we found a block.
|
2013-02-13 08:15:05 +00:00
|
|
|
((> (* signum depth) 0)
|
2012-11-13 18:57:26 +00:00
|
|
|
(setq down t))
|
2013-07-03 01:02:18 +00:00
|
|
|
;; We're at the same depth as when we started, and we've
|
|
|
|
;; encountered a block before. Stop.
|
2013-02-13 08:15:05 +00:00
|
|
|
((and down (zerop depth))
|
2012-11-13 18:57:26 +00:00
|
|
|
(setq done t))
|
2013-07-03 01:02:18 +00:00
|
|
|
;; Lower depth, means outer block, can stop now.
|
2013-02-13 08:15:05 +00:00
|
|
|
((< (* signum depth) 0)
|
2013-07-03 01:02:18 +00:00
|
|
|
(setq done t)))))))
|
2012-11-12 01:11:06 +00:00
|
|
|
(back-to-indentation)))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-beginning-of-block (&optional arg)
|
|
|
|
"Move backward to the beginning of the current block.
|
|
|
|
With ARG, move up multiple blocks."
|
|
|
|
(interactive "p")
|
|
|
|
(ruby-move-to-block (- (or arg 1))))
|
|
|
|
|
|
|
|
(defun ruby-end-of-block (&optional arg)
|
|
|
|
"Move forward to the end of the current block.
|
|
|
|
With ARG, move out of multiple blocks."
|
2012-11-13 18:57:26 +00:00
|
|
|
(interactive "p")
|
2008-12-10 18:59:26 +00:00
|
|
|
(ruby-move-to-block (or arg 1)))
|
|
|
|
|
|
|
|
(defun ruby-forward-sexp (&optional arg)
|
|
|
|
"Move forward across one balanced expression (sexp).
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
With ARG, do it many times. Negative ARG means move backward."
|
2008-12-10 18:59:26 +00:00
|
|
|
;; TODO: Document body
|
|
|
|
(interactive "p")
|
2013-10-05 18:37:08 +00:00
|
|
|
(cond
|
|
|
|
(ruby-use-smie (forward-sexp arg))
|
|
|
|
((and (numberp arg) (< arg 0)) (ruby-backward-sexp (- arg)))
|
|
|
|
(t
|
2008-12-10 18:59:26 +00:00
|
|
|
(let ((i (or arg 1)))
|
|
|
|
(condition-case nil
|
|
|
|
(while (> i 0)
|
|
|
|
(skip-syntax-forward " ")
|
2011-01-23 01:02:37 +00:00
|
|
|
(if (looking-at ",\\s *") (goto-char (match-end 0)))
|
2008-12-10 18:59:26 +00:00
|
|
|
(cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ")
|
|
|
|
(goto-char (match-end 0)))
|
|
|
|
((progn
|
|
|
|
(skip-chars-forward ",.:;|&^~=!?\\+\\-\\*")
|
|
|
|
(looking-at "\\s("))
|
|
|
|
(goto-char (scan-sexps (point) 1)))
|
|
|
|
((and (looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
|
|
|
|
(not (eq (char-before (point)) ?.))
|
|
|
|
(not (eq (char-before (point)) ?:)))
|
|
|
|
(ruby-end-of-block)
|
|
|
|
(forward-word 1))
|
|
|
|
((looking-at "\\(\\$\\|@@?\\)?\\sw")
|
|
|
|
(while (progn
|
|
|
|
(while (progn (forward-word 1) (looking-at "_")))
|
|
|
|
(cond ((looking-at "::") (forward-char 2) t)
|
|
|
|
((> (skip-chars-forward ".") 0))
|
|
|
|
((looking-at "\\?\\|!\\(=[~=>]\\|[^~=]\\)")
|
|
|
|
(forward-char 1) nil)))))
|
|
|
|
((let (state expr)
|
|
|
|
(while
|
|
|
|
(progn
|
|
|
|
(setq expr (or expr (ruby-expr-beg)
|
|
|
|
(looking-at "%\\sw?\\Sw\\|[\"'`/]")))
|
|
|
|
(nth 1 (setq state (apply 'ruby-parse-partial nil state))))
|
|
|
|
(setq expr t)
|
|
|
|
(skip-chars-forward "<"))
|
|
|
|
(not expr))))
|
|
|
|
(setq i (1- i)))
|
|
|
|
((error) (forward-word 1)))
|
2013-10-05 18:37:08 +00:00
|
|
|
i))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-backward-sexp (&optional arg)
|
|
|
|
"Move backward across one balanced expression (sexp).
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
With ARG, do it many times. Negative ARG means move forward."
|
2008-12-10 18:59:26 +00:00
|
|
|
;; TODO: Document body
|
|
|
|
(interactive "p")
|
2013-10-05 18:37:08 +00:00
|
|
|
(cond
|
|
|
|
(ruby-use-smie (backward-sexp arg))
|
|
|
|
((and (numberp arg) (< arg 0)) (ruby-forward-sexp (- arg)))
|
|
|
|
(t
|
2008-12-10 18:59:26 +00:00
|
|
|
(let ((i (or arg 1)))
|
|
|
|
(condition-case nil
|
|
|
|
(while (> i 0)
|
|
|
|
(skip-chars-backward " \t\n,.:;|&^~=!?\\+\\-\\*")
|
|
|
|
(forward-char -1)
|
|
|
|
(cond ((looking-at "\\s)")
|
|
|
|
(goto-char (scan-sexps (1+ (point)) -1))
|
|
|
|
(case (char-before)
|
|
|
|
(?% (forward-char -1))
|
2011-03-15 17:39:56 +00:00
|
|
|
((?q ?Q ?w ?W ?r ?x)
|
2008-12-10 18:59:26 +00:00
|
|
|
(if (eq (char-before (1- (point))) ?%) (forward-char -2))))
|
|
|
|
nil)
|
|
|
|
((looking-at "\\s\"\\|\\\\\\S_")
|
|
|
|
(let ((c (char-to-string (char-before (match-end 0)))))
|
|
|
|
(while (and (search-backward c)
|
|
|
|
(eq (logand (skip-chars-backward "\\") 1)
|
|
|
|
1))))
|
|
|
|
nil)
|
|
|
|
((looking-at "\\s.\\|\\s\\")
|
|
|
|
(if (ruby-special-char-p) (forward-char -1)))
|
|
|
|
((looking-at "\\s(") nil)
|
|
|
|
(t
|
|
|
|
(forward-char 1)
|
|
|
|
(while (progn (forward-word -1)
|
|
|
|
(case (char-before)
|
|
|
|
(?_ t)
|
|
|
|
(?. (forward-char -1) t)
|
|
|
|
((?$ ?@)
|
|
|
|
(forward-char -1)
|
|
|
|
(and (eq (char-before) (char-after)) (forward-char -1)))
|
|
|
|
(?:
|
|
|
|
(forward-char -1)
|
|
|
|
(eq (char-before) :)))))
|
|
|
|
(if (looking-at ruby-block-end-re)
|
|
|
|
(ruby-beginning-of-block))
|
|
|
|
nil))
|
|
|
|
(setq i (1- i)))
|
|
|
|
((error)))
|
2013-10-05 18:37:08 +00:00
|
|
|
i))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(defun ruby-indent-exp (&optional ignored)
|
|
|
|
"Indent each line in the balanced expression following the point."
|
2008-12-10 18:59:26 +00:00
|
|
|
(interactive "*P")
|
|
|
|
(let ((here (point-marker)) start top column (nest t))
|
|
|
|
(set-marker-insertion-type here t)
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(beginning-of-line)
|
|
|
|
(setq start (point) top (current-indentation))
|
|
|
|
(while (and (not (eobp))
|
|
|
|
(progn
|
|
|
|
(setq column (ruby-calculate-indent start))
|
|
|
|
(cond ((> column top)
|
|
|
|
(setq nest t))
|
|
|
|
((and (= column top) nest)
|
|
|
|
(setq nest nil) t))))
|
|
|
|
(ruby-indent-to column)
|
|
|
|
(beginning-of-line 2)))
|
|
|
|
(goto-char here)
|
|
|
|
(set-marker here nil))))
|
|
|
|
|
|
|
|
(defun ruby-add-log-current-method ()
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Return the current method name as a string.
|
2008-12-10 18:59:26 +00:00
|
|
|
This string includes all namespaces.
|
|
|
|
|
|
|
|
For example:
|
|
|
|
|
|
|
|
#exit
|
|
|
|
String#gsub
|
|
|
|
Net::HTTP#active?
|
2012-11-13 09:30:16 +00:00
|
|
|
File.open
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
See `add-log-current-defun-function'."
|
|
|
|
(condition-case nil
|
|
|
|
(save-excursion
|
2013-02-14 05:45:33 +00:00
|
|
|
(let* ((indent 0) mname mlist
|
|
|
|
(start (point))
|
|
|
|
(make-definition-re
|
|
|
|
(lambda (re)
|
|
|
|
(concat "^[ \t]*" re "[ \t]+"
|
|
|
|
"\\("
|
|
|
|
;; \\. and :: for class methods
|
|
|
|
"\\([A-Za-z_]" ruby-symbol-re "*\\|\\.\\|::" "\\)"
|
|
|
|
"+\\)")))
|
|
|
|
(definition-re (funcall make-definition-re ruby-defun-beg-re))
|
|
|
|
(module-re (funcall make-definition-re "\\(class\\|module\\)")))
|
2012-11-13 09:30:16 +00:00
|
|
|
;; Get the current method definition (or class/module).
|
2012-12-14 06:58:15 +00:00
|
|
|
(when (re-search-backward definition-re nil t)
|
|
|
|
(goto-char (match-beginning 1))
|
2013-02-14 05:45:33 +00:00
|
|
|
(if (not (string-equal "def" (match-string 1)))
|
|
|
|
(setq mlist (list (match-string 2)))
|
|
|
|
;; We're inside the method. For classes and modules,
|
|
|
|
;; this check is skipped for performance.
|
|
|
|
(when (ruby-block-contains-point start)
|
|
|
|
(setq mname (match-string 2))))
|
2012-12-14 06:58:15 +00:00
|
|
|
(setq indent (current-column))
|
|
|
|
(beginning-of-line))
|
2012-11-13 09:30:16 +00:00
|
|
|
;; Walk up the class/module nesting.
|
2008-12-10 18:59:26 +00:00
|
|
|
(while (and (> indent 0)
|
2013-02-14 05:45:33 +00:00
|
|
|
(re-search-backward module-re nil t))
|
2008-12-10 18:59:26 +00:00
|
|
|
(goto-char (match-beginning 1))
|
2013-02-14 05:45:33 +00:00
|
|
|
(when (< (current-column) indent)
|
2012-12-14 06:58:15 +00:00
|
|
|
(setq mlist (cons (match-string 2) mlist))
|
|
|
|
(setq indent (current-column))
|
|
|
|
(beginning-of-line)))
|
2012-11-13 09:30:16 +00:00
|
|
|
;; Process the method name.
|
2008-12-10 18:59:26 +00:00
|
|
|
(when mname
|
|
|
|
(let ((mn (split-string mname "\\.\\|::")))
|
|
|
|
(if (cdr mn)
|
|
|
|
(progn
|
2012-11-13 09:30:16 +00:00
|
|
|
(unless (string-equal "self" (car mn)) ; def self.foo
|
|
|
|
;; def C.foo
|
|
|
|
(let ((ml (nreverse mlist)))
|
|
|
|
;; If the method name references one of the
|
|
|
|
;; containing modules, drop the more nested ones.
|
2008-12-10 18:59:26 +00:00
|
|
|
(while ml
|
|
|
|
(if (string-equal (car ml) (car mn))
|
|
|
|
(setq mlist (nreverse (cdr ml)) ml nil))
|
2012-11-13 09:30:16 +00:00
|
|
|
(or (setq ml (cdr ml)) (nreverse mlist))))
|
|
|
|
(if mlist
|
|
|
|
(setcdr (last mlist) (butlast mn))
|
|
|
|
(setq mlist (butlast mn))))
|
|
|
|
(setq mname (concat "." (car (last mn)))))
|
2012-12-14 06:58:15 +00:00
|
|
|
;; See if the method is in singleton class context.
|
|
|
|
(let ((in-singleton-class
|
|
|
|
(when (re-search-forward ruby-singleton-class-re start t)
|
|
|
|
(goto-char (match-beginning 0))
|
2013-02-14 05:45:33 +00:00
|
|
|
;; FIXME: Optimize it out, too?
|
|
|
|
;; This can be slow in a large file, but
|
|
|
|
;; unlike class/module declaration
|
|
|
|
;; indentations, method definitions can be
|
|
|
|
;; intermixed with these, and may or may not
|
|
|
|
;; be additionally indented after visibility
|
|
|
|
;; keywords.
|
2012-12-14 06:58:15 +00:00
|
|
|
(ruby-block-contains-point start))))
|
|
|
|
(setq mname (concat
|
|
|
|
(if in-singleton-class "." "#")
|
|
|
|
mname))))))
|
2012-11-13 09:30:16 +00:00
|
|
|
;; Generate the string.
|
2008-12-10 18:59:26 +00:00
|
|
|
(if (consp mlist)
|
|
|
|
(setq mlist (mapconcat (function identity) mlist "::")))
|
|
|
|
(if mname
|
|
|
|
(if mlist (concat mlist mname) mname)
|
|
|
|
mlist)))))
|
|
|
|
|
2012-12-14 06:58:15 +00:00
|
|
|
(defun ruby-block-contains-point (pt)
|
|
|
|
(save-excursion
|
|
|
|
(save-match-data
|
|
|
|
(ruby-forward-sexp)
|
|
|
|
(> (point) pt))))
|
|
|
|
|
2012-09-08 23:32:25 +00:00
|
|
|
(defun ruby-brace-to-do-end (orig end)
|
|
|
|
(let (beg-marker end-marker)
|
|
|
|
(goto-char end)
|
|
|
|
(when (eq (char-before) ?\})
|
|
|
|
(delete-char -1)
|
2012-09-18 22:10:19 +00:00
|
|
|
(when (save-excursion
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
(not (bolp)))
|
2012-09-08 23:32:25 +00:00
|
|
|
(insert "\n"))
|
|
|
|
(insert "end")
|
|
|
|
(setq end-marker (point-marker))
|
|
|
|
(when (and (not (eobp)) (eq (char-syntax (char-after)) ?w))
|
|
|
|
(insert " "))
|
|
|
|
(goto-char orig)
|
|
|
|
(delete-char 1)
|
|
|
|
(when (eq (char-syntax (char-before)) ?w)
|
|
|
|
(insert " "))
|
|
|
|
(insert "do")
|
|
|
|
(setq beg-marker (point-marker))
|
|
|
|
(when (looking-at "\\(\\s \\)*|")
|
|
|
|
(unless (match-beginning 1)
|
|
|
|
(insert " "))
|
|
|
|
(goto-char (1+ (match-end 0)))
|
|
|
|
(search-forward "|"))
|
|
|
|
(unless (looking-at "\\s *$")
|
|
|
|
(insert "\n"))
|
|
|
|
(indent-region beg-marker end-marker)
|
|
|
|
(goto-char beg-marker)
|
|
|
|
t)))
|
|
|
|
|
|
|
|
(defun ruby-do-end-to-brace (orig end)
|
2012-09-18 22:10:19 +00:00
|
|
|
(let (beg-marker end-marker beg-pos end-pos)
|
|
|
|
(goto-char (- end 3))
|
|
|
|
(when (looking-at ruby-block-end-re)
|
|
|
|
(delete-char 3)
|
|
|
|
(setq end-marker (point-marker))
|
|
|
|
(insert "}")
|
|
|
|
(goto-char orig)
|
|
|
|
(delete-char 2)
|
2013-10-25 04:35:56 +00:00
|
|
|
;; Maybe this should be customizable, let's see if anyone asks.
|
|
|
|
(insert "{ ")
|
2012-09-18 22:10:19 +00:00
|
|
|
(setq beg-marker (point-marker))
|
|
|
|
(when (looking-at "\\s +|")
|
|
|
|
(delete-char (- (match-end 0) (match-beginning 0) 1))
|
|
|
|
(forward-char)
|
|
|
|
(re-search-forward "|" (line-end-position) t))
|
|
|
|
(save-excursion
|
|
|
|
(skip-chars-forward " \t\n\r")
|
|
|
|
(setq beg-pos (point))
|
|
|
|
(goto-char end-marker)
|
|
|
|
(skip-chars-backward " \t\n\r")
|
|
|
|
(setq end-pos (point)))
|
|
|
|
(when (or
|
|
|
|
(< end-pos beg-pos)
|
|
|
|
(and (= (line-number-at-pos beg-pos) (line-number-at-pos end-pos))
|
|
|
|
(< (+ (current-column) (- end-pos beg-pos) 2) fill-column)))
|
|
|
|
(just-one-space -1)
|
|
|
|
(goto-char end-marker)
|
|
|
|
(just-one-space -1))
|
|
|
|
(goto-char beg-marker)
|
|
|
|
t)))
|
2012-08-12 22:06:56 +00:00
|
|
|
|
|
|
|
(defun ruby-toggle-block ()
|
2012-09-08 23:32:25 +00:00
|
|
|
"Toggle block type from do-end to braces or back.
|
|
|
|
The block must begin on the current line or above it and end after the point.
|
|
|
|
If the result is do-end block, it will always be multiline."
|
2012-08-12 22:06:56 +00:00
|
|
|
(interactive)
|
2012-09-08 23:32:25 +00:00
|
|
|
(let ((start (point)) beg end)
|
|
|
|
(end-of-line)
|
|
|
|
(unless
|
|
|
|
(if (and (re-search-backward "\\({\\)\\|\\_<do\\(\\s \\|$\\||\\)")
|
|
|
|
(progn
|
|
|
|
(setq beg (point))
|
|
|
|
(save-match-data (ruby-forward-sexp))
|
|
|
|
(setq end (point))
|
|
|
|
(> end start)))
|
|
|
|
(if (match-beginning 1)
|
|
|
|
(ruby-brace-to-do-end beg end)
|
|
|
|
(ruby-do-end-to-brace beg end)))
|
|
|
|
(goto-char start))))
|
2012-08-12 22:06:56 +00:00
|
|
|
|
2013-11-02 01:10:10 +00:00
|
|
|
(eval-and-compile
|
|
|
|
(defconst ruby-percent-literal-beg-re
|
|
|
|
"\\(%\\)[qQrswWxIi]?\\([[:punct:]]\\)"
|
|
|
|
"Regexp to match the beginning of percent literal.")
|
|
|
|
|
|
|
|
(defconst ruby-syntax-methods-before-regexp
|
|
|
|
'("gsub" "gsub!" "sub" "sub!" "scan" "split" "split!" "index" "match"
|
|
|
|
"assert_match" "Given" "Then" "When")
|
|
|
|
"Methods that can take regexp as the first argument.
|
2013-05-19 06:01:23 +00:00
|
|
|
It will be properly highlighted even when the call omits parens.")
|
|
|
|
|
2013-11-02 01:10:10 +00:00
|
|
|
(defvar ruby-syntax-before-regexp-re
|
|
|
|
(concat
|
|
|
|
;; Special tokens that can't be followed by a division operator.
|
|
|
|
"\\(^\\|[[=(,~;<>]"
|
|
|
|
;; Distinguish ternary operator tokens.
|
|
|
|
;; FIXME: They don't really have to be separated with spaces.
|
|
|
|
"\\|[?:] "
|
|
|
|
;; Control flow keywords and operators following bol or whitespace.
|
|
|
|
"\\|\\(?:^\\|\\s \\)"
|
|
|
|
(regexp-opt '("if" "elsif" "unless" "while" "until" "when" "and"
|
|
|
|
"or" "not" "&&" "||"))
|
|
|
|
;; Method name from the list.
|
|
|
|
"\\|\\_<"
|
|
|
|
(regexp-opt ruby-syntax-methods-before-regexp)
|
|
|
|
"\\)\\s *")
|
|
|
|
"Regexp to match text that can be followed by a regular expression."))
|
|
|
|
|
|
|
|
(defun ruby-syntax-propertize-function (start end)
|
|
|
|
"Syntactic keywords for Ruby mode. See `syntax-propertize-function'."
|
|
|
|
(let (case-fold-search)
|
|
|
|
(goto-char start)
|
|
|
|
(remove-text-properties start end '(ruby-expansion-match-data))
|
|
|
|
(ruby-syntax-propertize-heredoc end)
|
|
|
|
(ruby-syntax-enclosing-percent-literal end)
|
|
|
|
(funcall
|
|
|
|
(syntax-propertize-rules
|
|
|
|
;; $' $" $` .... are variables.
|
|
|
|
;; ?' ?" ?` are character literals (one-char strings in 1.9+).
|
|
|
|
("\\([?$]\\)[#\"'`]"
|
|
|
|
(1 (unless (save-excursion
|
|
|
|
;; Not within a string.
|
|
|
|
(nth 3 (syntax-ppss (match-beginning 0))))
|
|
|
|
(string-to-syntax "\\"))))
|
|
|
|
;; Regular expressions. Start with matching unescaped slash.
|
|
|
|
("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)"
|
|
|
|
(1 (let ((state (save-excursion (syntax-ppss (match-beginning 1)))))
|
|
|
|
(when (or
|
|
|
|
;; Beginning of a regexp.
|
|
|
|
(and (null (nth 8 state))
|
|
|
|
(save-excursion
|
|
|
|
(forward-char -1)
|
|
|
|
(looking-back ruby-syntax-before-regexp-re
|
|
|
|
(point-at-bol))))
|
|
|
|
;; End of regexp. We don't match the whole
|
|
|
|
;; regexp at once because it can have
|
|
|
|
;; string interpolation inside, or span
|
|
|
|
;; several lines.
|
|
|
|
(eq ?/ (nth 3 state)))
|
|
|
|
(string-to-syntax "\"/")))))
|
|
|
|
;; Expression expansions in strings. We're handling them
|
|
|
|
;; here, so that the regexp rule never matches inside them.
|
|
|
|
(ruby-expression-expansion-re
|
|
|
|
(0 (ignore (ruby-syntax-propertize-expansion))))
|
|
|
|
("^=en\\(d\\)\\_>" (1 "!"))
|
|
|
|
("^\\(=\\)begin\\_>" (1 "!"))
|
|
|
|
;; Handle here documents.
|
|
|
|
((concat ruby-here-doc-beg-re ".*\\(\n\\)")
|
|
|
|
(7 (unless (or (nth 8 (save-excursion
|
|
|
|
(syntax-ppss (match-beginning 0))))
|
|
|
|
(ruby-singleton-class-p (match-beginning 0)))
|
|
|
|
(put-text-property (match-beginning 7) (match-end 7)
|
|
|
|
'syntax-table (string-to-syntax "\""))
|
|
|
|
(ruby-syntax-propertize-heredoc end))))
|
|
|
|
;; Handle percent literals: %w(), %q{}, etc.
|
|
|
|
((concat "\\(?:^\\|[[ \t\n<+(,=]\\)" ruby-percent-literal-beg-re)
|
|
|
|
(1 (prog1 "|" (ruby-syntax-propertize-percent-literal end)))))
|
|
|
|
(point) end)))
|
|
|
|
|
|
|
|
(defun ruby-syntax-propertize-heredoc (limit)
|
|
|
|
(let ((ppss (syntax-ppss))
|
|
|
|
(res '()))
|
|
|
|
(when (eq ?\n (nth 3 ppss))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (nth 8 ppss))
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(beginning-of-line)
|
2013-11-02 01:10:10 +00:00
|
|
|
(while (re-search-forward ruby-here-doc-beg-re
|
|
|
|
(line-end-position) t)
|
|
|
|
(unless (ruby-singleton-class-p (match-beginning 0))
|
|
|
|
(push (concat (ruby-here-doc-end-match) "\n") res))))
|
|
|
|
(save-excursion
|
|
|
|
;; With multiple openers on the same line, we don't know in which
|
|
|
|
;; part `start' is, so we have to go back to the beginning.
|
|
|
|
(when (cdr res)
|
|
|
|
(goto-char (nth 8 ppss))
|
|
|
|
(setq res (nreverse res)))
|
|
|
|
(while (and res (re-search-forward (pop res) limit 'move))
|
|
|
|
(if (null res)
|
|
|
|
(put-text-property (1- (point)) (point)
|
|
|
|
'syntax-table (string-to-syntax "\""))))
|
|
|
|
;; End up at bol following the heredoc openers.
|
|
|
|
;; Propertize expression expansions from this point forward.
|
|
|
|
))))
|
|
|
|
|
|
|
|
(defun ruby-syntax-enclosing-percent-literal (limit)
|
|
|
|
(let ((state (syntax-ppss))
|
|
|
|
(start (point)))
|
|
|
|
;; When already inside percent literal, re-propertize it.
|
|
|
|
(when (eq t (nth 3 state))
|
|
|
|
(goto-char (nth 8 state))
|
|
|
|
(when (looking-at ruby-percent-literal-beg-re)
|
|
|
|
(ruby-syntax-propertize-percent-literal limit))
|
|
|
|
(when (< (point) start) (goto-char start)))))
|
|
|
|
|
|
|
|
(defun ruby-syntax-propertize-percent-literal (limit)
|
|
|
|
(goto-char (match-beginning 2))
|
|
|
|
;; Not inside a simple string or comment.
|
|
|
|
(when (eq t (nth 3 (syntax-ppss)))
|
|
|
|
(let* ((op (char-after))
|
|
|
|
(ops (char-to-string op))
|
|
|
|
(cl (or (cdr (aref (syntax-table) op))
|
|
|
|
(cdr (assoc op '((?< . ?>))))))
|
|
|
|
parse-sexp-lookup-properties)
|
|
|
|
(save-excursion
|
|
|
|
(condition-case nil
|
|
|
|
(progn
|
|
|
|
(if cl ; Paired delimiters.
|
|
|
|
;; Delimiter pairs of the same kind can be nested
|
|
|
|
;; inside the literal, as long as they are balanced.
|
|
|
|
;; Create syntax table that ignores other characters.
|
|
|
|
(with-syntax-table (make-char-table 'syntax-table nil)
|
|
|
|
(modify-syntax-entry op (concat "(" (char-to-string cl)))
|
|
|
|
(modify-syntax-entry cl (concat ")" ops))
|
|
|
|
(modify-syntax-entry ?\\ "\\")
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) limit)
|
|
|
|
(forward-list))) ; skip to the paired character
|
|
|
|
;; Single character delimiter.
|
|
|
|
(re-search-forward (concat "[^\\]\\(?:\\\\\\\\\\)*"
|
|
|
|
(regexp-quote ops)) limit nil))
|
|
|
|
;; Found the closing delimiter.
|
|
|
|
(put-text-property (1- (point)) (point) 'syntax-table
|
|
|
|
(string-to-syntax "|")))
|
|
|
|
;; Unclosed literal, do nothing.
|
|
|
|
((scan-error search-failed)))))))
|
|
|
|
|
|
|
|
(defun ruby-syntax-propertize-expansion ()
|
|
|
|
;; Save the match data to a text property, for font-locking later.
|
|
|
|
;; Set the syntax of all double quotes and backticks to punctuation.
|
|
|
|
(let* ((beg (match-beginning 2))
|
|
|
|
(end (match-end 2))
|
|
|
|
(state (and beg (save-excursion (syntax-ppss beg)))))
|
|
|
|
(when (ruby-syntax-expansion-allowed-p state)
|
|
|
|
(put-text-property beg (1+ beg) 'ruby-expansion-match-data
|
|
|
|
(match-data))
|
|
|
|
(goto-char beg)
|
|
|
|
(while (re-search-forward "[\"`]" end 'move)
|
|
|
|
(put-text-property (match-beginning 0) (match-end 0)
|
|
|
|
'syntax-table (string-to-syntax "."))))))
|
|
|
|
|
|
|
|
(defun ruby-syntax-expansion-allowed-p (parse-state)
|
|
|
|
"Return non-nil if expression expansion is allowed."
|
|
|
|
(let ((term (nth 3 parse-state)))
|
|
|
|
(cond
|
|
|
|
((memq term '(?\" ?` ?\n ?/)))
|
|
|
|
((eq term t)
|
|
|
|
(save-match-data
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(save-excursion
|
2013-11-02 01:10:10 +00:00
|
|
|
(goto-char (nth 8 parse-state))
|
|
|
|
(looking-at "%\\(?:[QWrxI]\\|\\W\\)")))))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-11-02 01:10:10 +00:00
|
|
|
(defun ruby-syntax-propertize-expansions (start end)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char start)
|
|
|
|
(while (re-search-forward ruby-expression-expansion-re end 'move)
|
|
|
|
(ruby-syntax-propertize-expansion))))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(defun ruby-in-ppss-context-p (context &optional ppss)
|
|
|
|
(let ((ppss (or ppss (syntax-ppss (point)))))
|
|
|
|
(if (cond
|
|
|
|
((eq context 'anything)
|
|
|
|
(or (nth 3 ppss)
|
|
|
|
(nth 4 ppss)))
|
|
|
|
((eq context 'string)
|
|
|
|
(nth 3 ppss))
|
|
|
|
((eq context 'heredoc)
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(eq ?\n (nth 3 ppss)))
|
2008-12-10 18:59:26 +00:00
|
|
|
((eq context 'non-heredoc)
|
|
|
|
(and (ruby-in-ppss-context-p 'anything)
|
|
|
|
(not (ruby-in-ppss-context-p 'heredoc))))
|
|
|
|
((eq context 'comment)
|
|
|
|
(nth 4 ppss))
|
|
|
|
(t
|
|
|
|
(error (concat
|
|
|
|
"Internal error on `ruby-in-ppss-context-p': "
|
|
|
|
"context name `" (symbol-name context) "' is unknown"))))
|
|
|
|
t)))
|
|
|
|
|
|
|
|
(defvar ruby-font-lock-syntax-table
|
|
|
|
(let ((tbl (copy-syntax-table ruby-mode-syntax-table)))
|
|
|
|
(modify-syntax-entry ?_ "w" tbl)
|
|
|
|
tbl)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"The syntax table to use for fontifying Ruby mode buffers.
|
2008-12-10 18:59:26 +00:00
|
|
|
See `font-lock-syntax-table'.")
|
|
|
|
|
2013-07-16 19:16:51 +00:00
|
|
|
(defconst ruby-font-lock-keyword-beg-re "\\(?:^\\|[^.@$]\\|\\.\\.\\)")
|
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
(defconst ruby-font-lock-keywords
|
|
|
|
(list
|
|
|
|
;; functions
|
2013-07-09 01:17:48 +00:00
|
|
|
'("^\\s *def\\s +\\(?:[^( \t\n.]*\\.\\)?\\([^( \t\n]+\\)"
|
2008-12-10 18:59:26 +00:00
|
|
|
1 font-lock-function-name-face)
|
2013-07-16 19:16:51 +00:00
|
|
|
;; keywords
|
2013-06-21 23:07:49 +00:00
|
|
|
(list (concat
|
2013-07-16 19:16:51 +00:00
|
|
|
ruby-font-lock-keyword-beg-re
|
2008-12-10 18:59:26 +00:00
|
|
|
(regexp-opt
|
2013-06-21 23:07:49 +00:00
|
|
|
'("alias"
|
2008-12-10 18:59:26 +00:00
|
|
|
"and"
|
|
|
|
"begin"
|
|
|
|
"break"
|
|
|
|
"case"
|
|
|
|
"class"
|
|
|
|
"def"
|
2013-06-21 23:07:49 +00:00
|
|
|
"defined?"
|
2008-12-10 18:59:26 +00:00
|
|
|
"do"
|
|
|
|
"elsif"
|
|
|
|
"else"
|
|
|
|
"fail"
|
|
|
|
"ensure"
|
|
|
|
"for"
|
|
|
|
"end"
|
|
|
|
"if"
|
|
|
|
"in"
|
|
|
|
"module"
|
|
|
|
"next"
|
|
|
|
"not"
|
|
|
|
"or"
|
|
|
|
"redo"
|
|
|
|
"rescue"
|
|
|
|
"retry"
|
|
|
|
"return"
|
|
|
|
"then"
|
|
|
|
"super"
|
|
|
|
"unless"
|
|
|
|
"undef"
|
|
|
|
"until"
|
|
|
|
"when"
|
|
|
|
"while"
|
|
|
|
"yield")
|
2013-07-16 19:16:51 +00:00
|
|
|
'symbols))
|
|
|
|
1 'font-lock-keyword-face)
|
|
|
|
;; some core methods
|
|
|
|
(list (concat
|
|
|
|
ruby-font-lock-keyword-beg-re
|
2013-06-21 23:07:49 +00:00
|
|
|
(regexp-opt
|
2013-07-16 19:16:51 +00:00
|
|
|
'(;; built-in methods on Kernel
|
|
|
|
"__callee__"
|
2013-07-03 15:46:45 +00:00
|
|
|
"__dir__"
|
|
|
|
"__method__"
|
|
|
|
"abort"
|
|
|
|
"at_exit"
|
|
|
|
"autoload"
|
|
|
|
"autoload?"
|
|
|
|
"binding"
|
|
|
|
"block_given?"
|
|
|
|
"caller"
|
|
|
|
"catch"
|
|
|
|
"eval"
|
|
|
|
"exec"
|
|
|
|
"exit"
|
|
|
|
"exit!"
|
|
|
|
"fail"
|
|
|
|
"fork"
|
|
|
|
"format"
|
|
|
|
"lambda"
|
|
|
|
"load"
|
|
|
|
"loop"
|
|
|
|
"open"
|
|
|
|
"p"
|
|
|
|
"print"
|
|
|
|
"printf"
|
|
|
|
"proc"
|
|
|
|
"putc"
|
|
|
|
"puts"
|
|
|
|
"raise"
|
|
|
|
"rand"
|
|
|
|
"readline"
|
|
|
|
"readlines"
|
|
|
|
"require"
|
|
|
|
"require_relative"
|
|
|
|
"sleep"
|
|
|
|
"spawn"
|
|
|
|
"sprintf"
|
|
|
|
"srand"
|
|
|
|
"syscall"
|
|
|
|
"system"
|
|
|
|
"throw"
|
|
|
|
"trap"
|
|
|
|
"warn"
|
|
|
|
;; keyword-like private methods on Module
|
|
|
|
"alias_method"
|
2013-06-22 13:25:43 +00:00
|
|
|
"attr"
|
|
|
|
"attr_accessor"
|
|
|
|
"attr_reader"
|
|
|
|
"attr_writer"
|
|
|
|
"define_method"
|
|
|
|
"extend"
|
|
|
|
"include"
|
2013-06-21 23:07:49 +00:00
|
|
|
"module_function"
|
2013-07-03 15:46:45 +00:00
|
|
|
"prepend"
|
2013-06-21 23:07:49 +00:00
|
|
|
"private"
|
|
|
|
"protected"
|
|
|
|
"public"
|
2013-06-22 13:25:43 +00:00
|
|
|
"refine"
|
|
|
|
"using")
|
2013-07-16 19:16:51 +00:00
|
|
|
'symbols))
|
|
|
|
1 'font-lock-builtin-face)
|
2008-12-10 18:59:26 +00:00
|
|
|
;; here-doc beginnings
|
2012-11-13 03:07:09 +00:00
|
|
|
`(,ruby-here-doc-beg-re 0 (unless (ruby-singleton-class-p (match-beginning 0))
|
|
|
|
'font-lock-string-face))
|
2013-09-05 13:05:01 +00:00
|
|
|
;; Perl-ish keywords
|
|
|
|
"\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$"
|
2008-12-10 18:59:26 +00:00
|
|
|
;; variables
|
2013-07-16 19:16:51 +00:00
|
|
|
`(,(concat ruby-font-lock-keyword-beg-re
|
|
|
|
"\\_<\\(nil\\|self\\|true\\|false\\)\\>")
|
|
|
|
1 font-lock-variable-name-face)
|
2013-07-03 15:46:45 +00:00
|
|
|
;; keywords that evaluate to certain values
|
|
|
|
'("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" 0 font-lock-variable-name-face)
|
2012-09-07 04:15:56 +00:00
|
|
|
;; symbols
|
|
|
|
'("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
|
2012-09-24 11:39:33 +00:00
|
|
|
2 font-lock-constant-face)
|
2008-12-10 18:59:26 +00:00
|
|
|
;; variables
|
|
|
|
'("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
|
|
|
|
1 font-lock-variable-name-face)
|
|
|
|
'("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
|
|
|
|
0 font-lock-variable-name-face)
|
|
|
|
;; constants
|
2013-07-12 23:36:14 +00:00
|
|
|
'("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)"
|
|
|
|
1 (unless (eq ?\( (char-after)) font-lock-type-face))
|
2012-09-24 11:39:33 +00:00
|
|
|
'("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face)
|
2013-07-13 19:10:19 +00:00
|
|
|
;; conversion methods on Kernel
|
2013-07-16 19:16:51 +00:00
|
|
|
(list (concat ruby-font-lock-keyword-beg-re
|
2013-07-13 19:10:19 +00:00
|
|
|
(regexp-opt '("Array" "Complex" "Float" "Hash"
|
|
|
|
"Integer" "Rational" "String") 'symbols))
|
|
|
|
1 font-lock-builtin-face)
|
2008-12-10 18:59:26 +00:00
|
|
|
;; expression expansion
|
2012-09-07 04:15:56 +00:00
|
|
|
'(ruby-match-expression-expansion
|
2012-11-14 12:17:21 +00:00
|
|
|
2 font-lock-variable-name-face t)
|
2013-07-09 01:17:48 +00:00
|
|
|
;; negation char
|
|
|
|
'("[^[:alnum:]_]\\(!\\)[^=]"
|
|
|
|
1 font-lock-negation-char-face)
|
2013-07-12 20:28:53 +00:00
|
|
|
;; character literals
|
|
|
|
;; FIXME: Support longer escape sequences.
|
2013-07-16 14:47:23 +00:00
|
|
|
'("\\_<\\?\\\\?\\S " 0 font-lock-string-face)
|
2008-12-10 18:59:26 +00:00
|
|
|
)
|
* progmodes/ruby-mode.el (ruby-mode-abbrev-table, ruby-mode-map)
(ruby-mode-syntax-table, ruby-indent-tabs-mode, ruby-indent-level)
(ruby-mode-variables, ruby-indent-line, ruby-indent-size)
(ruby-calculate-indent, ruby-electric-brace, ruby-beginning-of-defun)
(ruby-here-doc-beg-syntax, ruby-here-doc-end-syntax)
(ruby-font-lock-syntax-table, ruby-font-lock-keywords)
(ruby-end-of-defun, ruby-move-to-block, ruby-forward-sexp)
(ruby-backward-sexp, ruby-add-log-current-method)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(ruby-in-here-doc-p, ruby-mode): Fix typos in docstrings.
(ruby-deep-indent-paren): Doc fix.
(ruby-insert-encoding-magic-comment): Remove * from docstring.
(ruby-here-doc-find-end): Reflow docstring.
2008-12-11 11:03:42 +00:00
|
|
|
"Additional expressions to highlight in Ruby mode.")
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2012-09-07 04:15:56 +00:00
|
|
|
(defun ruby-match-expression-expansion (limit)
|
2012-12-14 04:55:23 +00:00
|
|
|
(let* ((prop 'ruby-expansion-match-data)
|
|
|
|
(pos (next-single-char-property-change (point) prop nil limit))
|
|
|
|
value)
|
|
|
|
(when (and pos (> pos (point)))
|
2012-11-14 12:17:21 +00:00
|
|
|
(goto-char pos)
|
|
|
|
(or (and (setq value (get-text-property pos prop))
|
|
|
|
(progn (set-match-data value) t))
|
|
|
|
(ruby-match-expression-expansion limit)))))
|
2012-09-07 04:15:56 +00:00
|
|
|
|
2008-12-10 18:59:26 +00:00
|
|
|
;;;###autoload
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
(define-derived-mode ruby-mode prog-mode "Ruby"
|
2013-11-04 14:20:58 +00:00
|
|
|
"Major mode for editing Ruby code.
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-11-05 09:30:15 +00:00
|
|
|
\\{ruby-mode-map}"
|
2008-12-10 18:59:26 +00:00
|
|
|
(ruby-mode-variables)
|
|
|
|
|
2013-11-02 00:17:54 +00:00
|
|
|
(setq-local imenu-create-index-function 'ruby-imenu-create-index)
|
|
|
|
(setq-local add-log-current-defun-function 'ruby-add-log-current-method)
|
|
|
|
(setq-local beginning-of-defun-function 'ruby-beginning-of-defun)
|
|
|
|
(setq-local end-of-defun-function 'ruby-end-of-defun)
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-10-13 21:35:31 +00:00
|
|
|
(add-hook 'after-save-hook 'ruby-mode-set-encoding nil 'local)
|
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
2010-09-10 23:13:42 +00:00
|
|
|
|
2013-11-02 00:17:54 +00:00
|
|
|
(setq-local electric-indent-chars (append '(?\{ ?\}) electric-indent-chars))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-11-02 00:17:54 +00:00
|
|
|
(setq-local font-lock-defaults '((ruby-font-lock-keywords) nil nil))
|
|
|
|
(setq-local font-lock-keywords ruby-font-lock-keywords)
|
|
|
|
(setq-local font-lock-syntax-table ruby-font-lock-syntax-table)
|
2008-12-10 18:59:26 +00:00
|
|
|
|
2013-11-02 01:10:10 +00:00
|
|
|
(setq-local syntax-propertize-function #'ruby-syntax-propertize-function))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
;;; Invoke ruby-mode when appropriate
|
|
|
|
|
|
|
|
;;;###autoload
|
2013-06-21 23:14:38 +00:00
|
|
|
(add-to-list 'auto-mode-alist
|
|
|
|
(cons (purecopy (concat "\\(?:\\."
|
2013-06-22 00:11:24 +00:00
|
|
|
"rb\\|ru\\|rake\\|thor"
|
|
|
|
"\\|jbuilder\\|gemspec"
|
2013-06-21 23:14:38 +00:00
|
|
|
"\\|/"
|
2013-06-22 00:11:24 +00:00
|
|
|
"\\(?:Gem\\|Rake\\|Cap\\|Thor"
|
|
|
|
"Vagrant\\|Guard\\)file"
|
2013-06-21 23:14:38 +00:00
|
|
|
"\\)\\'")) 'ruby-mode))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2013-09-11 06:44:35 +00:00
|
|
|
(dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8"))
|
|
|
|
(add-to-list 'interpreter-mode-alist (cons (purecopy name) 'ruby-mode)))
|
2008-12-10 18:59:26 +00:00
|
|
|
|
|
|
|
(provide 'ruby-mode)
|
|
|
|
|
|
|
|
;;; ruby-mode.el ends here
|