comparison lisp/font-lock.el @ 400:a86b2b5e0111 r21-2-30

Import from CVS: tag r21-2-30
author cvs
date Mon, 13 Aug 2007 11:14:34 +0200
parents 74fd4e045ea6
children 2f8bb876ab1d
comparison
equal deleted inserted replaced
399:376370fb5946 400:a86b2b5e0111
2337 ;; Special constants: 2337 ;; Special constants:
2338 '("\\<\\(this\\|super\\)\\>" (1 font-lock-reference-face)) 2338 '("\\<\\(this\\|super\\)\\>" (1 font-lock-reference-face))
2339 '("\\<\\(false\\|null\\|true\\)\\>" (1 font-lock-keyword-face)) 2339 '("\\<\\(false\\|null\\|true\\)\\>" (1 font-lock-keyword-face))
2340 2340
2341 ;; Class names: 2341 ;; Class names:
2342 (list (concat "\\<class\\>\\s *" java-font-lock-identifier-regexp) 2342 (list (concat "\\<\\(class\\|interface\\)\\>\\s *"
2343 1 'font-lock-function-name-face) 2343 java-font-lock-identifier-regexp)
2344 2 'font-lock-function-name-face)
2344 2345
2345 ;; Package declarations: 2346 ;; Package declarations:
2346 (list (concat "\\<\\(package\\|import\\)\\>\\s *" 2347 (list (concat "\\<\\(package\\|import\\)\\>\\s *"
2347 java-font-lock-identifier-regexp) 2348 java-font-lock-identifier-regexp)
2348 '(2 font-lock-reference-face) 2349 '(2 font-lock-reference-face)
2476 ("\\<public\\>" 0 font-lock-reference-face)) 2477 ("\\<public\\>" 0 font-lock-reference-face))
2477 java-font-lock-keywords-2 2478 java-font-lock-keywords-2
2478 2479
2479 (list 2480 (list
2480 2481
2481 ;; Java doc tags 2482 ;; Javadoc tags
2482 '("@\\(author\\|exception\\|throws\\|deprecated\\|param\\|return\\|see\\|since\\|version\\)\\s " 2483 '("@\\(author\\|exception\\|throws\\|deprecated\\|param\\|return\\|see\\|since\\|version\\)\\s "
2483 0 font-lock-keyword-face t) 2484 0 font-lock-keyword-face t)
2484 2485
2485 ;; Doc tag - Parameter identifiers 2486 ;; Doc tag - Parameter identifiers
2486 (list (concat "@param\\s +" java-font-lock-identifier-regexp) 2487 (list (concat "@param\\s +" java-font-lock-identifier-regexp)
2487 1 'font-lock-variable-name-face t) 2488 1 'font-lock-variable-name-face t)
2488 2489
2489 ;; Doc tag - Exception types 2490 ;; Doc tag - Exception types
2490 (list (concat "@exception\\s +" 2491 (list (concat "@\\(exception\\|throws\\)\\s +"
2491 java-font-lock-identifier-regexp) 2492 java-font-lock-identifier-regexp)
2492 '(1 (if (equal (char-after (match-end 0)) ?.) 2493 '(2 (if (equal (char-after (match-end 0)) ?.)
2493 font-lock-reference-face font-lock-type-face) t) 2494 font-lock-reference-face font-lock-type-face) t)
2494 (list (concat "\\=\\." java-font-lock-identifier-regexp) 2495 (list (concat "\\=\\." java-font-lock-identifier-regexp)
2495 '(goto-char (match-end 0)) nil 2496 '(goto-char (match-end 0)) nil
2496 '(1 (if (equal (char-after (match-end 0)) ?.) 2497 '(1 (if (equal (char-after (match-end 0)) ?.)
2497 'font-lock-reference-face 'font-lock-type-face) t))) 2498 'font-lock-reference-face 'font-lock-type-face) t)))
2498 2499
2499 ;; Doc tag - Exception types
2500 (list (concat "@exception\\s +"
2501 java-font-lock-identifier-regexp)
2502 '(1 (if (equal (char-after (match-end 0)) ?.)
2503 font-lock-reference-face font-lock-type-face) t)
2504 (list (concat "\\=\\." java-font-lock-identifier-regexp)
2505 '(goto-char (match-end 0)) nil
2506 '(1 (if (equal (char-after (match-end 0)) ?.)
2507 'font-lock-reference-face 'font-lock-type-face) t)))
2508
2509 ;; Doc tag - Cross-references, usually to methods 2500 ;; Doc tag - Cross-references, usually to methods
2510 '("@see\\s +\\(\\S *[^][ \t\n\r\f(){},.;:]\\)" 2501 '("@see\\s +\\(\\S *[^][ \t\n\r\f(){},.;:]\\)"
2511 1 font-lock-function-name-face t) 2502 1 font-lock-function-name-face t)
2512 2503
2513 ;; Doc tag - Links 2504 ;; Doc tag - docRoot (1.3)
2514 '("{@link\\s +\\([^}]*\\)}" 2505 '("\\({ *@docRoot *}\\)"
2506 0 font-lock-keyword-face t)
2507 ;; Doc tag - beaninfo, unofficial but widely used, even by Sun
2508 '("\\(@beaninfo\\)"
2515 0 font-lock-keyword-face t) 2509 0 font-lock-keyword-face t)
2516 ;; Doc tag - Links 2510 ;; Doc tag - Links
2517 '("{@link\\s +\\(\\S +\\s +\\S +\\)}" 2511 '("{ *@link\\s +\\([^}]+\\)}"
2512 0 font-lock-keyword-face t)
2513 ;; Doc tag - Links
2514 '("{ *@link\\s +\\(\\(\\S +\\)\\|\\(\\S +\\s +\\S +\\)\\) *}"
2518 1 font-lock-function-name-face t) 2515 1 font-lock-function-name-face t)
2519 2516
2520 ))) 2517 )))
2521 ) 2518 )
2522 2519