From eb0c957e8e9cc32aa6e7007e7692c84801a46fef Mon Sep 17 00:00:00 2001 From: Nick Heap Date: Wed, 16 Dec 2020 09:16:11 +0000 Subject: [PATCH] Latest changes --- .vscode/launch.json | 11 +++++++++++ src/AntBuildFileProvider.js | 20 +++++++++++++++++++- src/BuildFileParser.js | 13 ------------- workspace/workspace.code-workspace | 4 ++++ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index a6de2c9..20df662 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -38,6 +38,17 @@ "${workspaceFolder}/workspace/workspace.code-workspace" ] }, + { + "name": "Extension test ablunit", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": [ + "--disable-extensions", + "--extensionDevelopmentPath=${workspaceFolder}", + "D:/workspaces/nickheap2/ablunit-mods/ablunit-mods" + ] + }, { "name": "Extension Tests", "type": "extensionHost", diff --git a/src/AntBuildFileProvider.js b/src/AntBuildFileProvider.js index a08f512..f965815 100644 --- a/src/AntBuildFileProvider.js +++ b/src/AntBuildFileProvider.js @@ -76,6 +76,7 @@ module.exports = class AntBuildFileProvider { return resolve(this.buildFiles) } + // loop workspace folders for (const workspaceFolder of this.workspaceFolders) { const workspaceFolderPath = workspaceFolder.uri.fsPath try { @@ -92,11 +93,28 @@ module.exports = class AntBuildFileProvider { } catch (error) { messageHelper.showErrorMessage(`Error reading ${buildFilename} !`) // return reject(new Error('Error reading build.xml!: ' + error)) + + var errorFile = { + buildFilename: buildFilename, + fullBuildFilename: fullBuildFilename, + projectDetails: {}, + buildTargets: [], + buildSourceFiles: [], + errorMessage: 'Error reading file!' + } + this.buildFiles.push(errorFile) + continue } try { - var buildFile = { buildFilename: buildFilename, fullBuildFilename: fullBuildFilename, projectDetails: {}, buildTargets: [], buildSourceFiles: [] } + var buildFile = { + buildFilename: buildFilename, + fullBuildFilename: fullBuildFilename, + projectDetails: {}, + buildTargets: [], + buildSourceFiles: [] + } buildFile.projectDetails = this.BuildFileParser.getProjectDetails(buildFileObj) var [buildTargets, buildSourceFiles] = await this.BuildFileParser.getTargets(fullBuildFilename, buildFileObj, [], []) diff --git a/src/BuildFileParser.js b/src/BuildFileParser.js index d7cdf46..0da325d 100644 --- a/src/BuildFileParser.js +++ b/src/BuildFileParser.js @@ -117,19 +117,6 @@ module.exports = class BuildFileParser { return reject(new Error('Error parsing build.xml!:' + err)) } else { return resolve(result) - // project = this.setParentValues(result.project) - - // var root = { - // id: 'build.xml', - // contextValue: 'antFile', - // filePath: buildXml, - // fileName: 'build.xml' - // } - // if (project.$.name) { - // root.project = project.$.name - // } - - // resolve([root]) } }) }) diff --git a/workspace/workspace.code-workspace b/workspace/workspace.code-workspace index 91a3d8a..d2086a6 100644 --- a/workspace/workspace.code-workspace +++ b/workspace/workspace.code-workspace @@ -8,6 +8,10 @@ "name": "dist", "path": "..\\dist" }, + { + "name": "ablunit-mods", + "path": "..\\..\\ablunit-mods\\ablunit-mods" + }, { "name": "test", "path": "..\\test"