summaryrefslogtreecommitdiff
path: root/misc/ruby-mode.el
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-01 09:42:38 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-01 09:42:38 +0000
commitfedf48986da718580062d081dda38c4ee182c254 (patch)
tree65e06d76c544a8d80296d686bf88ec3af41fdc50 /misc/ruby-mode.el
parentacbb1c943457d3b8802f099ee0e34331bc78bd38 (diff)
2000-05-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc/ruby-mode.el')
-rw-r--r--misc/ruby-mode.el46
1 files changed, 40 insertions, 6 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 3b0bb2a2bc0..a882f9fba12 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -114,6 +114,31 @@
(defvar ruby-indent-level 2
"*Indentation of ruby statements.")
+(eval-when-compile (require 'cl))
+(defun ruby-imenu-create-index ()
+ (let ((index-alist '())
+ class-name class-begin method-name method-begin decl)
+ (goto-char (point-min))
+ (while (re-search-forward "^\\s *\\(class\\|def\\)\\s *\\([^(\n ]+\\)" nil t)
+ (setq decl (buffer-substring (match-beginning 1) (match-end 1)))
+ (cond
+ ((string= "class" decl)
+ (setq class-begin (match-beginning 2))
+ (setq class-name (buffer-substring class-begin (match-end 2)))
+ (push (cons class-name (match-beginning 0)) index-alist)
+ (ruby-mark-defun)
+ (save-restriction
+ (narrow-to-region (region-beginning) (region-end))
+ (while (re-search-forward "^\\s *def\\s *\\([^(\n ]+\\)" nil t)
+ (setq method-begin (match-beginning 1))
+ (setq method-name (buffer-substring method-begin (match-end 1)))
+ (push (cons (concat class-name "#" method-name) (match-beginning 0)) index-alist))))
+ ((string= "def" decl)
+ (setq method-begin (match-beginning 2))
+ (setq method-name (buffer-substring method-begin (match-end 2)))
+ (push (cons method-name (match-beginning 0)) index-alist))))
+ index-alist))
+
(defun ruby-mode-variables ()
(set-syntax-table ruby-mode-syntax-table)
(setq local-abbrev-table ruby-mode-abbrev-table)
@@ -153,6 +178,9 @@ The variable ruby-indent-level controls the amount of indentation.
(setq major-mode 'ruby-mode)
(ruby-mode-variables)
+ (make-local-variable 'imenu-create-index-function)
+ (setq imenu-create-index-function 'ruby-imenu-create-index)
+
(run-hooks 'ruby-mode-hook))
(defun ruby-current-indentation ()
@@ -250,8 +278,8 @@ The variable ruby-indent-level controls the amount of indentation.
(goto-char indent-point))))
((looking-at "/")
(cond
- ((and (not (eobp)) (ruby-expr-beg 'expr-arg))
- (if (re-search-forward "[^\\]/" indent-point t)
+ ((and (not (eobp)) (ruby-expr-beg))
+ (if (re-search-forward "[^\\]\\(\\\\\\\\\\)*/" indent-point t)
nil
(setq in-string (point))
(goto-char indent-point)))
@@ -262,15 +290,21 @@ The variable ruby-indent-level controls the amount of indentation.
((and (not (eobp)) (ruby-expr-beg 'expr-arg)
(not (looking-at "%="))
(looking-at "%[Qqrxw]?\\(.\\)"))
+ (goto-char (match-beginning 1))
(setq w (buffer-substring (match-beginning 1)
(match-end 1)))
(cond
- ((string= w "[") (setq w "]"))
+ ((string= w "[") (setq w "\\]"))
((string= w "{") (setq w "}"))
((string= w "(") (setq w ")"))
- ((string= w "<") (setq w ">")))
- (goto-char (match-end 0))
- (if (search-forward w indent-point t)
+ ((string= w "<") (setq w ">"))
+ ((member w '("*" "." "+" "?" "^" "$"))
+ (setq w (concat "\\" w))))
+ (if (re-search-forward
+ (if (string= w "\\")
+ "\\\\[^\\]*\\\\"
+ (concat "[^\\]\\(\\\\\\\\\\)*" w))
+ indent-point t)
nil
(setq in-string (point))
(goto-char indent-point)))