更新语言规则

Author: sumneko

client/src/extension.ts

@@ -5,11 +5,30 @@ import * as addonManager from './addon_manager/registration';
 
 import luadoc from "../3rd/vscode-lua-doc/extension.js";
 
+interface LuaDocContext extends vscode.ExtensionContext {
+    ViewType: string;
+    OpenCommand: string;
+}
+
 export function activate(context: vscode.ExtensionContext) {
     languageserver.activate(context);
 
-    const luaDocContext = {
-        ...context,
+    const luaDocContext: LuaDocContext = {
+        asAbsolutePath: context.asAbsolutePath,
+        environmentVariableCollection: context.environmentVariableCollection,
+        extensionUri: context.extensionUri,
+        globalState: context.globalState,
+        storagePath: context.storagePath,
+        subscriptions: context.subscriptions,
+        workspaceState: context.workspaceState,
+        extensionMode: context.extensionMode,
+        globalStorageUri: context.globalStorageUri,
+        logUri: context.logUri,
+        logPath: context.logPath,
+        globalStoragePath: context.globalStoragePath,
+        extension: context.extension,
+        secrets: context.secrets,
+        storageUri: context.storageUri,
         extensionPath: context.extensionPath + '/client/3rd/vscode-lua-doc',
         ViewType: 'lua-doc',
         OpenCommand: 'extension.lua.doc',

client/src/languageConfiguration.ts

@@ -0,0 +1,32 @@
+import * as vscode from 'vscode';
+
+export const luaConfiguration: vscode.LanguageConfiguration = {
+    autoClosingPairs: [
+        { open: "{", close: "}" },
+        { open: "[", close: "]" },
+        { open: "(", close: ")" },
+        { open: "'", close: "'", notIn: [vscode.SyntaxTokenType.String] },
+        { open: '"', close: '"', notIn: [vscode.SyntaxTokenType.String] },
+        { open: "[=", close: "=]" },
+        { open: "[==", close: "==]" },
+        { open: "[===", close: "===]" },
+        { open: "[====", close: "====]" },
+        { open: "[=====", close: "=====]" },
+    ],
+    onEnterRules: [
+        {
+            beforeText: /\b(\)|then|do|else)\b\s*$/,
+            afterText: /^\s*end\b/,
+            action: {
+                indentAction: vscode.IndentAction.IndentOutdent,
+            }
+        },
+        {
+            beforeText: /\b(repeat)\b\s*$/,
+            afterText: /^\s*until\b/,
+            action: {
+                indentAction: vscode.IndentAction.IndentOutdent,
+            }
+        },
+    ]
+};

client/src/languageserver.ts

@@ -2,6 +2,7 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 import * as vscode from 'vscode';
+import { luaConfiguration } from './languageConfiguration';
 import {
     workspace as Workspace,
     ExtensionContext,
@@ -109,7 +110,13 @@ class LuaClient extends Disposable {
         private context: ExtensionContext,
         private documentSelector: DocumentSelector
     ) {
-        super(() => this.dispose());
+        super(() => {
+            for (const disposable of this.disposables) {
+                disposable.dispose();
+            }
+        });
+
+        this.disposables.push(vscode.languages.setLanguageConfiguration('lua', luaConfiguration));
     }
 
     async start() {
@@ -245,9 +252,7 @@ class LuaClient extends Disposable {
 
     async stop() {
         this.client?.stop();
-        for (const disposable of this.disposables) {
-            disposable.dispose();
-        }
+        this.dispose();
     }
 
     statusBar() {