From a22fc815ecf8bc22f75ae8a58238ae374d3b68d4 Mon Sep 17 00:00:00 2001 From: csh Date: Thu, 11 Sep 2025 14:26:41 +0800 Subject: [PATCH 1/2] fix and format --- vscode/src/extension.ts | 27 ++++++++++----------------- vscode/syntaxes/tsl.tmLanguage.json | 8 +++----- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts index 60edfcd..0fe0ae6 100644 --- a/vscode/src/extension.ts +++ b/vscode/src/extension.ts @@ -49,7 +49,7 @@ export function activate(context: vscode.ExtensionContext) { } const serverOptions: ServerOptions = { - run: {command: serverExe, transport: TransportKind.stdio, args: ['--log=trace', '--log-stderr']}, + run: {command: serverExe, transport: TransportKind.stdio, args: serverArguments}, debug: {command: serverExe, transport: TransportKind.stdio, args: ['--log=trace', '--log-stderr']} } @@ -58,23 +58,16 @@ export function activate(context: vscode.ExtensionContext) { synchronize: { fileEvents: vscode.workspace.createFileSystemWatcher('**/*.tsl') } - - const clientOptions: LanguageClientOptions = { - documentSelector: [{scheme: 'file', language: 'tsl'}], - synchronize: { - fileEvents: vscode.workspace.createFileSystemWatcher('**/*.tsl') - } - } - - client = new LanguageClient( - 'tslLanguageServer', // 客户端唯一ID - 'TSL Language Server', // 用户可见名称 - serverOptions, - clientOptions - ) - - client.start() } + + client = new LanguageClient( + 'tslLanguageServer', // 客户端唯一ID + 'TSL Language Server', // 用户可见名称 + serverOptions, + clientOptions + ) + + client.start() } export function deactivate(): Thenable | undefined { diff --git a/vscode/syntaxes/tsl.tmLanguage.json b/vscode/syntaxes/tsl.tmLanguage.json index debcfc6..e5e22f7 100644 --- a/vscode/syntaxes/tsl.tmLanguage.json +++ b/vscode/syntaxes/tsl.tmLanguage.json @@ -2,10 +2,7 @@ "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", "name": "TSL", "scopeName": "source.tsl", - "fileTypes": [ - "tsl", - "tsf" - ], + "fileTypes": ["tsl", "tsf"], "patterns": [ { "include": "#comments" @@ -573,4 +570,5 @@ "match": "[()\\[\\]{},;:.@?]" } } -} \ No newline at end of file +} + From 9b83e6e07c3d87f5a1bae1d40ba6b08a4c962e02 Mon Sep 17 00:00:00 2001 From: csh Date: Thu, 11 Sep 2025 14:27:01 +0800 Subject: [PATCH 2/2] update test.tsl --- test/test.tsl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test.tsl b/test/test.tsl index 9a19ae0..8f0e655 100644 --- a/test/test.tsl +++ b/test/test.tsl @@ -81,7 +81,7 @@ b := array((1, 2), (3, 4)); sql += "update ts_xbcheck result set isvalid = "$status$remark$" where checkid in ('"$array2str (checkid[(i-1)*len:], "','")$"');\r\n" -sql += +sql += 123; // tsl-web块 @@ -91,6 +91,8 @@ sql +=

+ +