Merge pull request #111 from AvaloniaUI:prashantvc/issue94

Previewer not working, unexpected end of json input
AvaloniaUI · Feb 15, 2024 · c7ae745 · c7ae745
2 parents 1b485cf + 2d1df44
commit c7ae745
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/vscode-avalonia/package.json b/src/vscode-avalonia/package.json
@@ -3,7 +3,7 @@
   "displayName": "Avalonia for VSCode",
   "description": "Avalonia tools for Visual Studio Code",
   "publisher": "AvaloniaTeam",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "license": "MIT",
   "preview": true,
   "qna": "false",

diff --git a/src/vscode-avalonia/src/services/solutionParser.ts b/src/vscode-avalonia/src/services/solutionParser.ts
@@ -99,20 +99,20 @@ async function parseSolution(context: vscode.ExtensionContext): Promise<string>
 	const parserLocation = path.join(avaloniaExtn.extensionPath, "solutionParserTool", "SolutionParser.dll");
 
 	return new Promise<string>((resolve, reject) => {
+		var jsonContent = "";
 		const previewer = spawn(`dotnet`, [parserLocation.putInQuotes(), solutionPath.putInQuotes()], {
 			windowsVerbatimArguments: false,
 			env: process.env,
 			shell: true,
 		});
 
 		previewer.on("spawn", () => {
+			jsonContent = "";
 			logger.appendLine(`parser process args: ${previewer.spawnargs}`);
 		});
 
 		previewer.stdout.on("data", (data) => {
-			const jsonContent = data.toString();
-			updateSolutionModel(context, jsonContent);
-			resolve(jsonContent);
+			jsonContent += data.toString();
 		});
 
 		previewer.stderr.on("data", (data) => {
@@ -121,6 +121,10 @@ async function parseSolution(context: vscode.ExtensionContext): Promise<string>
 		});
 
 		previewer.on("close", (code) => {
+			if (code === 0) {
+				updateSolutionModel(context, jsonContent);
+				resolve(jsonContent);
+			}
 			logger.appendLine(`parser process exited ${code}`);
 		});
 	});