Latest changes

NickHeap2 · Dec 16, 2020 · eb0c957 · eb0c957 · sflynn850 · Dec 16, 2020
1 parent 67e580a
commit eb0c957
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -8,6 +8,10 @@
       "name": "dist",
       "path": "..\\dist"
     },
+    {
+      "name": "ablunit-mods",
+      "path": "..\\..\\ablunit-mods\\ablunit-mods"
+    },
     {
       "name": "test",
       "path": "..\\test"