Merge branch 'master' into lsp-server

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块
 <?tslx>
@@ -91,6 +91,8 @@ sql +=
       <?tsl write("TSL Script");?>
     </p>
   </Body>
+  <?= "aaa", Date() ?>
 </HTML>
+<?tsl
 
 

vscode/src/extension.ts

@@ -49,16 +49,10 @@ 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']}
   }
 
-  const clientOptions: LanguageClientOptions = {
-    documentSelector: [{scheme: 'file', language: 'tsl'}],
-    synchronize: {
-      fileEvents: vscode.workspace.createFileSystemWatcher('**/*.tsl')
-    }
-
   const clientOptions: LanguageClientOptions = {
     documentSelector: [{scheme: 'file', language: 'tsl'}],
     synchronize: {
@@ -74,7 +68,6 @@ export function activate(context: vscode.ExtensionContext) {
   )
 
   client.start()
-  }
 }
 
 export function deactivate(): Thenable<void> | undefined {

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"
@@ -574,3 +571,4 @@
     }
   }
 }
+