Index all swift files initially when no Package.swift defined #14

Author: vknabel

CHANGELOG.md

@@ -5,7 +5,7 @@
 * Removed unused config `editor.quickSuggestions`
 * Will no longer write `sde.buildOnSave` or `editor.quickSuggestions` to workspace settings
 * `#` will now trigger completions
-* `-target` will now be detected for `UIKit`, `AppKit`, `WatchKit` and `Foundation` on macOS and linux
+* `-target` will now be detected for `UIKit`, `AppKit`, `WatchKit` and `Foundation` on macOS and linux #15
 * Index all swift files together when no `Package.swift` defined #14
 
 ## 2.3.0

src/server/server.ts

@@ -56,13 +56,12 @@ export function initializeModuleMeta() {
 		}
 	})
 	sp.stderr.on('data', (data) => {
-		if (isTracingOn) {
-			trace('***swift package describe stderr*** ', '' + data)
-		}
+		trace('***swift package describe stderr*** ', '' + data)
+		const globalSources = allModuleSources.get(null)
+		gatherAllSwiftFilesInPath(workspaceRoot)
+			.forEach(globalSources.add.bind(globalSources));
 	})
-	// sp.on('exit', function (code, signal) {
-	// 	trace('***swift package describe***', `code: ${code}, signal: ${signal}`)
-	// })
+
 	sp.on('error', function (err) {
 		trace('***swift package describe error*** ', (<Error>err).message)
 		if ((<Error>err).message.indexOf("ENOENT") > 0) {
@@ -75,6 +74,23 @@ export function initializeModuleMeta() {
 	});
 }
 
+function gatherAllSwiftFilesInPath(root: string): string[] {
+	const result = new Array<string>();
+	try {
+		const dir = fs.readdirSync(root).filter(sub => !sub.startsWith('.') && sub !== 'Carthage');
+		for (const sub of dir) {
+			if (path.extname(sub) === '.swift') {
+				result.push(path.join(root, sub));
+			} else {
+				result.push(...gatherAllSwiftFilesInPath(path.join(root, sub)));
+			}
+		}
+		return result;
+	} catch (error) {
+		return result;
+	}
+}
+
 export function getAllSourcePaths(srcPath: string): string[] {
 	const sp = path.dirname(srcPath)
 	for (let [m, p] of allModulePaths) {