SAS: Improved comments in proc groovy and proc lua (#2392)

Author: cedporter

components/prism-sas.js

@@ -101,10 +101,10 @@
 				pattern: /(?:action)/i,
 				alias: 'keyword'
 			},
+			'comment': comment,
 			'function': func,
 			'arg-value': args['arg-value'],
 			'operator': args.operator,
-			'comment': comment,
 			'argument': args.arg,
 			'number': number,
 			'numeric-constant': numericConstant,
@@ -154,15 +154,17 @@
 		},
 
 		'proc-groovy': {
-			pattern: /(^proc\s+groovy(?:\s+[\w|=]+)?;)(?:\s*submit)[\s\S]+?(?=^(?:proc\s+\w+|quit|run|data);|(?![\s\S]))/im,
+			pattern: /(^proc\s+groovy(?:\s+[\w|=]+)?;)[\s\S]+?(?=^(?:proc\s+\w+|quit|run|data);|(?![\s\S]))/im,
 			lookbehind: true,
 			inside: {
+				'comment': comment,
 				'groovy': {
 					pattern: RegExp(/(^[ \t]*submit(?:\s+(?:load|parseonly|norun))?)(?:<str>|[^"'])+?(?=endsubmit;)/.source.replace(/<str>/g, function () { return stringPattern; }), 'im'),
 					lookbehind: true,
 					alias: 'language-groovy',
 					inside: Prism.languages.groovy
 				},
+				'keyword': keywords,
 				'submit-statement': submitStatement,
 				'global-statements': globalStatements,
 				'number': number,
@@ -173,15 +175,17 @@
 		},
 
 		'proc-lua': {
-			pattern: /(^proc\s+lua(?:\s+[\w|=]+)?;)(?:\s*submit)[\s\S]+?(?=^(?:proc\s+\w+|quit|run|data);|(?![\s\S]))/im,
+			pattern: /(^proc\s+lua(?:\s+[\w|=]+)?;)[\s\S]+?(?=^(?:proc\s+\w+|quit|run|data);|(?![\s\S]))/im,
 			lookbehind: true,
 			inside: {
+				'comment': comment,
 				'lua': {
 					pattern: RegExp(/(^[ \t]*submit(?:\s+(?:load|parseonly|norun))?)(?:<str>|[^"'])+?(?=endsubmit;)/.source.replace(/<str>/g, function () { return stringPattern; }), 'im'),
 					lookbehind: true,
 					alias: 'language-lua',
 					inside: Prism.languages.lua
 				},
+				'keyword': keywords,
 				'submit-statement': submitStatement,
 				'global-statements': globalStatements,
 				'number': number,
@@ -195,6 +199,7 @@
 			pattern: /(^proc\s+cas(?:\s+[\w|=]+)?;)[\s\S]+?(?=^(?:proc\s+\w+|quit|data);|(?![\s\S]))/im,
 			lookbehind: true,
 			inside: {
+				'comment': comment,
 				'statement-var': {
 					pattern: /((?:^|\s)=?)saveresult\s+[^;]+/im,
 					lookbehind: true,
@@ -217,7 +222,6 @@
 				'step': step,
 				'keyword': keywords,
 				'function': func,
-				'comment': comment,
 				'format': format,
 				'altformat': altformat,
 				'global-statements': globalStatements,

components/prism-sas.min.js

@@ -1,4 +1,5 @@
 proc groovy classpath=cp;
+  /* Testing a comment */
   submit parseonly;
     class Speaker {
       def say( word ) {
@@ -26,6 +27,7 @@ quit;
 	],
 	[
 		"proc-groovy", [
+			["comment", "/* Testing a comment */"],
 			["submit-statement", "submit parseonly"],
 			[
 				"groovy", [
@@ -60,9 +62,12 @@ quit;
 			["punctuation", ";"]
 		]
 	],
-	["keyword", "eval"],
-	["string", "\"s = new Speaker(); s.say( \"\"Hi\"\" )\""],
-	["punctuation", ";"],
+	["proc-groovy",[
+		["keyword", "eval"],
+		["string", "\"s = new Speaker(); s.say( \"\"Hi\"\" )\""],
+		["punctuation", ";"]
+		]
+	],
 	["step", "quit"],
 	["punctuation", ";"]
 ]

tests/languages/groovy+sas/groovy_inclusion.test

@@ -1,4 +1,5 @@
 proc lua;
+/* Testing a comment */
 submit;
    array = { 1, 2, 3, 4, 5 }
    sum = sas.sumx(array)
@@ -13,6 +14,7 @@ run;
 	["punctuation", ";"],
 	[
 		"proc-lua", [
+			["comment", "/* Testing a comment */"],
 			["submit-statement", "submit"],
 			[
 				"lua", [

tests/languages/lua+sas/lua_inclusion.test

@@ -6,6 +6,7 @@ run;
 quit;
 
 proc cas;
+  /* Testing a comment */
   session casauto;
   output log;
   table.loadTable / path="iris.sashdat";
@@ -61,6 +62,7 @@ quit;
 	["punctuation", ";"],
 	["proc-cas",
 		[
+			["comment", "/* Testing a comment */"],
 			["keyword", "session"],
 			" casauto",
 			["punctuation", ";"],