Browse files

• Remove the assumption that each line starts with a '*'.

> 'Starting with Javadoc 1.4, the leading asterisks are optional.'
-- http://java.sun.com/j2se/javadoc/writingdoccomments/

git-svn-id: http://svn.textmate.org/trunk/Review/Bundles/JavaDoc.tmbundle@10154 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
1 parent d45f654 commit e4afb1cd89866ab15f0a614a8cbbe077518a0334 @alkemist alkemist committed Jul 5, 2008
Showing with 14 additions and 47 deletions.
  1. +14 −47 Syntaxes/JavaDoc.tmLanguage
View
61 Syntaxes/JavaDoc.tmLanguage
@@ -39,28 +39,11 @@
<array>
<dict>
<key>include</key>
- <string>#invalid</string>
+ <string>#inline</string>
</dict>
<dict>
<key>begin</key>
- <string>\*\s*(?=\w)</string>
- <key>contentName</key>
- <string>text.html</string>
- <key>end</key>
- <string>(?=\s*\*\s*@)|(?=\s*\*\s*/)</string>
- <key>name</key>
- <string>meta.documentation.comment.javadoc</string>
- <key>patterns</key>
- <array>
- <dict>
- <key>include</key>
- <string>#inline</string>
- </dict>
- </array>
- </dict>
- <dict>
- <key>begin</key>
- <string>\*\s*((\@)param)</string>
+ <string>((\@)param)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -90,7 +73,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)return)</string>
+ <string>((\@)return)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -120,7 +103,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)throws)</string>
+ <string>((\@)throws)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -150,7 +133,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)exception)</string>
+ <string>((\@)exception)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -180,7 +163,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)author)</string>
+ <string>((\@)author)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -210,7 +193,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)version)</string>
+ <string>((\@)version)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -240,7 +223,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)see)</string>
+ <string>((\@)see)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -270,7 +253,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)since)</string>
+ <string>((\@)since)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -300,7 +283,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)serial)</string>
+ <string>((\@)serial)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -330,7 +313,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)serialField)</string>
+ <string>((\@)serialField)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -360,7 +343,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)serialData)</string>
+ <string>((\@)serialData)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -390,7 +373,7 @@
</dict>
<dict>
<key>begin</key>
- <string>\*\s*((\@)deprecated)</string>
+ <string>((\@)deprecated)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -433,7 +416,7 @@
</dict>
</dict>
<key>match</key>
- <string>\*\s*((\@)\S+)\s</string>
+ <string>((\@)\S+)\s</string>
</dict>
</array>
</dict>
@@ -446,10 +429,6 @@
<array>
<dict>
<key>include</key>
- <string>#invalid</string>
- </dict>
- <dict>
- <key>include</key>
<string>#inline-formatting</string>
</dict>
<dict>
@@ -716,18 +695,6 @@
</dict>
</array>
</dict>
- <key>invalid</key>
- <dict>
- <key>patterns</key>
- <array>
- <dict>
- <key>match</key>
- <string>^(?!\s*\*).*$\n?</string>
- <key>name</key>
- <string>invalid.illegal.missing-asterisk.javadoc</string>
- </dict>
- </array>
- </dict>
</dict>
<key>scopeName</key>
<string>text.html.javadoc</string>

0 comments on commit e4afb1c

Please sign in to comment.