Improved autocompletion #8 (partially)

Author: vknabel

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.0
+* Autocompletion for external libraries like AppKit #8, UIKit still missing
+* Display short documentation on autocompletion
+* More reliable autocompletion, especially for global namespace
+
 ## 2.1.3
 * Improved new README
 * Deprecated debugger, use [LLDB Debugger](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb) instead

src/server/server.ts

@@ -231,14 +231,15 @@ connection.onCompletion(({textDocument, position}): Thenable<CompletionItem[]> =
 	const offset = document.offsetAt(position) //FIXME
 	return sourcekitProtocol
 		.codeComplete(srcText, srcPath, offset)
-		.then(function (completions) {
+		.then(function (completions: Object[] | null) {
 			let items = [];
-			for (let c of <Array<Object>>completions) {
+			for (let c of completions || []) {
 				let item = CompletionItem.create(c["key.description"])
 				item.kind = toCompletionItemKind(c["key.kind"])
 				item.detail = `${c["key.modulename"]}.${c["key.name"]}`
 				item.insertText = createSuggest(c["key.sourcetext"])
 				item.insertTextFormat = InsertTextFormat.Snippet
+				item.documentation = c["key.doc.brief"]
 				items.push(item)
 			}
 			return items
@@ -510,14 +511,17 @@ export function getShellExecPath() {
  * TODO: to use build yaml?
  */
 let argsImportPaths: string[] = null
-
 export function loadArgsImportPaths(): string[] {
 	if (!argsImportPaths) {
 		argsImportPaths = []
 		argsImportPaths.push("-I")
 		argsImportPaths.push(path.join(workspaceRoot, '.build', 'debug'))
 		//FIXME system paths can not be available automatically?
 		// rt += " -I"+"/usr/lib/swift/linux/x86_64"
+		argsImportPaths.push("-sdk")
+		argsImportPaths.push("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk")
+		argsImportPaths.push("-I")
+		argsImportPaths.push("/System/Library/Frameworks/")
 		argsImportPaths.push("-I")
 		argsImportPaths.push("/usr/lib/swift/pm/")
 		return argsImportPaths

src/server/sourcekites.ts

@@ -144,7 +144,7 @@ function typedResponse<T>(request: string, requestType: RequestType,
                 case "codecomplete":
                 case "demangle":
                     const res = JSON.parse(jsonify(resp))
-                    return res["key.results"]
+                    return res["key.results"] || []
                 case "editor.formattext":
                     const keyLine = extraState.keyLine
                     const lineRange = extraState.lineRange
@@ -327,6 +327,6 @@ function cutOffResponse(s: string): string {
 
 function jsonify(s: string): string {
     return s
-        .replace(/(key.[a-z_.]+):/g, '"$1":')
-        .replace(/(source.[a-z_.]+),/g, '"$1",')
+        .replace(/(key\.[a-z_.]+):/g, '"$1":')
+        .replace(/(source\.[a-z_.]+),/g, '"$1",')
 }