1)Adding annotation token for Java

2)Aliasing java annotation to punctuation 3)Aliasing grovy annotation to punctuation
PrismJS · Mar 8, 2016 · 99de6c2 · 99de6c2
1 parent 9c1a970
commit 99de6c2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/components/prism-groovy.js b/components/prism-groovy.js
@@ -22,6 +22,7 @@ Prism.languages.insertBefore('groovy', 'punctuation', {
 
 Prism.languages.insertBefore('groovy', 'function', {
 	'annotation': {
+		alias: 'punctuation',
 		pattern: /(^|[^.])@\w+/,
 		lookbehind: true
 	}

diff --git a/components/prism-groovy.min.js b/components/prism-groovy.min.js
diff --git a/components/prism-java.js b/components/prism-java.js
@@ -5,4 +5,12 @@ Prism.languages.java = Prism.languages.extend('clike', {
 		pattern: /(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<<?=?|>>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m,
 		lookbehind: true
 	}
-});
+});
+
+Prism.languages.insertBefore('java','function', {
+	'annotation': {
+		alias: 'punctuation',
+		pattern: /(^|[^.])@\w+/,
+		lookbehind: true
+	}
+});
diff --git a/components/prism-java.min.js b/components/prism-java.min.js
diff --git a/examples/prism-java.html b/examples/prism-java.html
@@ -25,7 +25,9 @@ <h2>Full example</h2>
 <pre><code>import java.util.Scanner;
 
 public class Life {
-    public static void show(boolean[][] grid){
+
+    @Override @Bind("One")
+    public void show(boolean[][] grid){
         String s = "";
         for(boolean[] row : grid){
             for(boolean val : row)
@@ -73,4 +75,4 @@ <h2>Known failures</h2>
 </p>
 
 <h3>Comment-like substrings</h3>
-<pre><code>"foo /* bar */ baz"; "foo // bar";</code></pre>
+<pre><code>"foo /* bar */ baz"; "foo // bar";</code></pre>
diff --git a/themes/prism-solarizedlight.css b/themes/prism-solarizedlight.css
@@ -145,4 +145,4 @@ pre[class*="language-"] {
 
 .token.entity {
 	cursor: help;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,4 +145,4 @@ pre[class*="language-"] { @@
     .token.entity {
     	cursor: help;
-    }
+    }