Better handle broken configuration (#254)

codefori · Oct 26, 2023 · 2709653 · 2709653
1 parent ded0197
commit 2709653
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/extension/client/src/requests.ts b/extension/client/src/requests.ts
@@ -44,7 +44,9 @@ export default function buildRequestHandlers(client: LanguageClient) {
 		const instance = getInstance();
 		if (instance && instance.getConnection()) {
 			const config = instance.getConfig();
-			return config.homeDirectory;
+			if (config) {
+				return config.homeDirectory;
+			}
 		}
 	})
 
@@ -103,13 +105,15 @@ export default function buildRequestHandlers(client: LanguageClient) {
 		const content = instance?.getContent();
 		const config = instance?.getConfig()!;
 
-		if (includePaths.length === 0) {
-			includePaths.push(config.homeDirectory);
-		}
+		if (instance && content && config) {
+			if (includePaths.length === 0) {
+				includePaths.push(config.homeDirectory);
+			}
 
-		const resolvedPath = await content?.streamfileResolve(bases, includePaths);
+			const resolvedPath = await content?.streamfileResolve(bases, includePaths);
 
-		return resolvedPath;
+			return resolvedPath;
+		}
  });
 
 	/**