[fix] No autocomplete #13

Author: vknabel

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.4.1
+* Extension did not work correctly
+* Can now be disabled by `"sde.enable": false`
+
 ## 2.4.0
 * Bumped internal dependencies to be more reliable on newer vscode versions
 * New setting `sde.swiftBuildingParams` allows run other commands than `swift build` #24 jinmingjian/sde#32

package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/vknabel"
   },
   "license": "Apache-2.0",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "publisher": "vknabel",
   "icon": "icons/icon.png",
   "galleryBanner": {
@@ -20,7 +20,7 @@
     "url": "https://github.com/vknabel/vscode-swift-development-environment"
   },
   "engines": {
-    "vscode": "^1.17.0"
+    "vscode": "^1.20.0"
   },
   "categories": [
     "Programming Languages"
@@ -107,7 +107,9 @@
         "sde.swiftBuildingParams": {
           "type": "array",
           "description": "The params that shall be passed to the swift command.",
-          "default": ["build"],
+          "default": [
+            "build"
+          ],
           "items": {
             "type": "string"
           }
@@ -119,6 +121,18 @@
         }
       }
     },
+    "languages": [
+      {
+        "id": "swift",
+        "extensions": [
+          ".swift"
+        ],
+        "aliases": [
+          "Swift"
+        ],
+        "firstLine": "^#!/.*\\bswift[0-9.-]*\\b"
+      }
+    ],
     "breakpoints": [
       {
         "language": "swift"
@@ -162,19 +176,19 @@
     "@types/js-yaml": "^3.11.1",
     "@types/node": "^10.1.2",
     "@types/xml-js": "^1.0.0",
-    "js-yaml": "^3.11.0",
     "mocha": "^2.3.3",
     "pegjs": "^0.10.0",
     "typescript": "^2.0.0",
-    "vscode": "^1.0.0"
+    "vscode": "^1.1.18"
   },
   "dependencies": {
     "bunyan": "^1.8.5",
+    "js-yaml": "^3.11.0",
     "fs-promise": "^1.0.0",
     "vscode-debugadapter": "^1.25.0",
     "vscode-debugprotocol": "^1.15.0",
-    "vscode-languageclient": "^3.0.2-beta.5",
-    "vscode-languageserver": "^3.0.2-beta.5",
+    "vscode-languageclient": "^4.1.4",
+    "vscode-languageserver": "^4.1.3",
     "xml-js": "^1.6.2"
   }
 }

src/clientMain.ts

@@ -41,11 +41,10 @@ export function activate(context: ExtensionContext) {
 	if (workspace.getConfiguration().get<boolean>('sde.enable') === false) {
 		return;
 	}
+	initConfig()
 	//debug
 	context.subscriptions.push(debug.registerDebugConfigurationProvider('swift', new SwiftConfigurationProvider()));
 
-	initConfig()
-
 	// The server is implemented in node
 	let serverModule = context.asAbsolutePath(path.join('out/src/server', 'server.js'));
 	// The debug options for the server
@@ -54,14 +53,17 @@ export function activate(context: ExtensionContext) {
 	// If the extension is launched in debug mode then the debug server options are used
 	// Otherwise the run options are used
 	let serverOptions: ServerOptions = {
-		run: { module: serverModule, transport: TransportKind.ipc },
+		run: { module: serverModule, transport: TransportKind.ipc, options: debugOptions },
 		debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
 	}
 
 	// Options to control the language client
 	let clientOptions: LanguageClientOptions = {
 		// Register the server for plain text documents
-		documentSelector: ['swift'],
+		documentSelector: [
+			{ language: 'swift', scheme: 'file' },
+			{ pattern: '*.swift', scheme: 'file' }
+		],
 		synchronize: {
 			configurationSection: ['swift', 'editor', '[swift]'],
 			// Notify the server about file changes to '.clientrc files contain in the workspace
@@ -76,8 +78,8 @@ export function activate(context: ExtensionContext) {
 	}
 
 	// Create the language client and start the client.
-	let disposable = new LanguageClient('Swift', serverOptions, clientOptions).start()
-
+	const langClient = new LanguageClient('Swift', serverOptions, clientOptions)
+	let disposable = langClient.start()
 	context.subscriptions.push(disposable)
 	diagnosticCollection = languages.createDiagnosticCollection('swift');
 	context.subscriptions.push(diagnosticCollection);

yarn.lock

@@ -18,8 +18,8 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.11.1.tgz#ac5bab26be5f9c6f74b6b23420f2cfa5a7a6ba40"
 
 "@types/node@*", "@types/node@^10.1.2":
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.2.tgz#1b928a0baa408fc8ae3ac012cc81375addc147c6"
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.0.tgz#078516315a84d56216b5d4fed8f75d59d3b16cac"
 
 "@types/xml-js@^1.0.0":
   version "1.0.0"
@@ -169,8 +169,8 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
 buffer-from@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
 
 bunyan@^1.8.5:
   version "1.8.12"
@@ -288,10 +288,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
 
 dtrace-provider@~0.8:
-  version "0.8.6"
-  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.6.tgz#428a223afe03425d2cd6d6347fdf40c66903563d"
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
   dependencies:
-    nan "^2.3.3"
+    nan "^2.10.0"
 
 duplexer@~0.1.1:
   version "0.1.1"
@@ -779,8 +779,8 @@ [email protected]:
     mkdirp "0.3.0"
 
 js-yaml@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -960,8 +960,8 @@ mocha@^4.0.1:
     supports-color "4.4.0"
 
 moment@^2.10.6:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
 [email protected]:
   version "0.7.1"
@@ -996,7 +996,7 @@ mz@^2.3.1:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.3.3:
+nan@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -1401,8 +1401,8 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
 typescript@^2.0.0:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
 
 unique-stream@^2.0.2:
   version "2.2.1"
@@ -1504,32 +1504,32 @@ [email protected], vscode-debugprotocol@^1.15.0:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.29.0.tgz#520030db8486f7d9e1f889ece82538efe7ec6fac"
 
-vscode-jsonrpc@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
+vscode-jsonrpc@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
 
-vscode-languageclient@^3.0.2-beta.5:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.1.tgz#c78e582459c24e58f88020dfa34065e976186a98"
+vscode-languageclient@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.1.4.tgz#fff1a6bca4714835dca7fce35bc4ce81442fdf2c"
   dependencies:
-    vscode-languageserver-protocol "3.5.1"
+    vscode-languageserver-protocol "^3.7.2"
 
-vscode-languageserver-protocol@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz#5144a3a9eeccbd83fe2745bd4ed75fad6cc45f0d"
+vscode-languageserver-protocol@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6"
   dependencies:
-    vscode-jsonrpc "3.5.0"
-    vscode-languageserver-types "3.5.0"
+    vscode-jsonrpc "^3.6.2"
+    vscode-languageserver-types "^3.7.2"
 
-vscode-languageserver-types@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
+vscode-languageserver-types@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
 
-vscode-languageserver@^3.0.2-beta.5:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz#e0044b7df4d2447ce12632dfc98f1ab0afacbdff"
+vscode-languageserver@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.1.3.tgz#937d37c955b6b9c2409388413cd6f54d1eb9fe7d"
   dependencies:
-    vscode-languageserver-protocol "3.5.1"
+    vscode-languageserver-protocol "^3.7.2"
     vscode-uri "^1.0.1"
 
 [email protected]:
@@ -1540,7 +1540,7 @@ vscode-uri@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.3.tgz#631bdbf716dccab0e65291a8dc25c23232085a52"
 
-vscode@^1.0.0:
+vscode@^1.1.18:
   version "1.1.18"
   resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.18.tgz#e9227265dc72fc826bd6cd7bd21193f4e48fa671"
   dependencies: