some changes for languageconfiguration

Author: daimor

src/extension.ts

@@ -235,9 +235,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.workspace.registerTextDocumentContentProvider(OBJECTSCRIPT_FILE_SCHEMA, documentContentProvider),
     vscode.workspace.registerTextDocumentContentProvider(OBJECTSCRIPTXML_FILE_SCHEMA, xmlContentProvider),
     vscode.workspace.registerFileSystemProvider(FILESYSTEM_SCHEMA, fileSystemProvider, { isCaseSensitive: true }),
-    vscode.languages.setLanguageConfiguration("objectscript-class", getLanguageConfiguration()),
-    vscode.languages.setLanguageConfiguration("objectscript", getLanguageConfiguration()),
-    vscode.languages.setLanguageConfiguration("objectscript-macros", getLanguageConfiguration()),
+    vscode.languages.setLanguageConfiguration("objectscript-class", getLanguageConfiguration("class")),
+    vscode.languages.setLanguageConfiguration("objectscript", getLanguageConfiguration("routine")),
+    vscode.languages.setLanguageConfiguration("objectscript-macros", getLanguageConfiguration("routine")),
     vscode.languages.registerDocumentSymbolProvider(
       documentSelector("objectscript-class"),
       new ObjectScriptClassSymbolProvider()

src/languageConfiguration.ts

@@ -2,20 +2,23 @@ import { IndentAction, LanguageConfiguration } from "vscode";
 
 export const WORD_PATTERN = /((?<=(class|extends|as|of) )(%?\b[a-z0-9]+(\.[a-z0-9]+)*\b))|(\^[a-z0-9]+(\.[a-z0-9]+)*)|((\${1,3}|[irm]?%|\^|#)?[a-z0-9]+)/i;
 
-export function getLanguageConfiguration(): LanguageConfiguration {
+export function getLanguageConfiguration(lang: string): LanguageConfiguration {
   return {
     wordPattern: WORD_PATTERN,
     brackets: [["{", "}"], ["(", ")"], ['"', '"']],
     comments: {
-      lineComment: "#;",
+      lineComment: lang === "class" ? "//" : "#;",
       blockComment: ["/*", "*/"],
     },
-    onEnterRules: [
-      {
-        beforeText: /^\/\/\//,
-        afterText: /.*/,
-        action: { indentAction: IndentAction.None, appendText: "/// " },
-      },
-    ],
+    onEnterRules:
+      lang === "class"
+        ? [
+            {
+              beforeText: /^\/\/\//,
+              afterText: /.*/,
+              action: { indentAction: IndentAction.None, appendText: "/// " },
+            },
+          ]
+        : [],
   };
 }