Browse Source

Update the language now, add monaco contrib

Andrew Watson 6 years ago
parent
commit
41797ecbbb
2 changed files with 5 additions and 4 deletions
  1. 4 4
      src/kotlin/kotlin.ts
  2. 1 0
      src/monaco.contribution.ts

+ 4 - 4
src/kotlin/kotlin.ts

@@ -10,10 +10,10 @@ import ILanguage = monaco.languages.IMonarchLanguage;
 
 export const conf: IRichLanguageConfiguration = {
 	// the default separators except `@$`
-	//wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
+	wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
 	comments: {
 		lineComment: '//',
-		blockComment: ['/*', '*/'],
+		blockComment: ['/**', '*/'],
 	},
 	brackets: [
 		['{', '}'],
@@ -37,8 +37,8 @@ export const conf: IRichLanguageConfiguration = {
 	],
 	folding: {
 		markers: {
-			//start: new RegExp("^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))"),
-			//end: new RegExp("^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))")
+			start: new RegExp("^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))"),
+			end: new RegExp("^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))")
 		}
 	}
 };

+ 1 - 0
src/monaco.contribution.ts

@@ -18,6 +18,7 @@ import './html/html.contribution';
 import './ini/ini.contribution';
 import './java/java.contribution';
 import './javascript/javascript.contribution';
+import './kotlin/kotlin.contribution';
 import './less/less.contribution';
 import './lua/lua.contribution';
 import './markdown/markdown.contribution';