From 41797ecbbb30bd1c306490be4de4691ce15e4439 Mon Sep 17 00:00:00 2001
From: Andrew Watson <anwatso@c02sr3h0h03m.guest.corp.microsoft.com>
Date: Fri, 7 Dec 2018 16:56:35 -0800
Subject: [PATCH] Update the language now, add monaco contrib

---
 src/kotlin/kotlin.ts       | 8 ++++----
 src/monaco.contribution.ts | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/kotlin/kotlin.ts b/src/kotlin/kotlin.ts
index bfe00319..8d8210d4 100644
--- a/src/kotlin/kotlin.ts
+++ b/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>))")
 		}
 	}
 };
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index ae9aad59..9704c086 100644
--- a/src/monaco.contribution.ts
+++ b/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';