Changes to fulfil comments from Rune

openmainframeproject · Oct 11, 2023 · f2014ef · f2014ef
1 parent b07c334
commit f2014ef
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 289 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,14 +33,18 @@ vs code extension/**/node_modules
 vs code extension/**/client/server
 vs code extension/**/.vscode-test
 vs code extension/**/Jenkinsfile
+vs code extension/Cobol-check/output/testResults.html
+# Below is made bu ./gradlew prepareDistribution!vs code extension/Cobol-check/bin/*
 
 vs-code-extension/**/package-lock.json
 vs-code-extension/**/out
 vs-code-extension/**/node_modules
 vs-code-extension/**/client/server
 vs-code-extension/**/.vscode-test
 vs-code-extension/**/Jenkinsfile
-
+vs-code-extension/Cobol-check/output/testResults.html
+# Below is made bu ./gradlew prepareDistribution
+!vs-code-extension/Cobol-check/bin/*
 
 # Java-related gitignore entries from: https://gist.github.com/dedunumax/54e82214715e35439227
 ##############################
@@ -73,7 +77,6 @@ buildNumber.properties
 ## Gradle
 ##############################
 bin/*
-!vs code extension/Cobol-check/bin/*
 build/*
 !build/distributions/
 .gradle

diff --git a/build/distributions/cobol-check-0.2.8.zip b/build/distributions/cobol-check-0.2.8.zip
diff --git a/vs-code-extension/Cobol-check/output/testResults.html b/vs-code-extension/Cobol-check/output/testResults.html
diff --git a/vs-code-extension/client/src/Helpers/ExtensionHelper.ts b/vs-code-extension/client/src/Helpers/ExtensionHelper.ts
@@ -23,7 +23,7 @@ export async function handleCobolCheckOut(output : CobParser.CobolCheckOutputPar
 				break;
 
 			case CobParser.OutputState.TestFailed:
-				console.log("TEST FAILES")
+				console.log("TEST FAILED")
 				testResultFile = appendPath(vsCodeInstallDir, await getConfigurationValueFor(configPath, 'test.results.file'));
 				htmlResult = await getTextFromFile(testResultFile + '.html');
 				showWebWiev('Test Results - ' + getCurrentProgramName(), htmlResult)

diff --git a/vs-code-extension/client/src/extension.ts b/vs-code-extension/client/src/extension.ts
@@ -273,7 +273,14 @@ async function createDirectoryItems( controller:vscode.TestController, uri: vsco
 		tmpDir = tmpDir + '/' + dirArr[i]
 		const existing = prevFile.children.get(tmpDir);
 
-		if(!existing){
+		if(existing){
+			const tmpData = testData.get(existing)
+			if(tmpData instanceof TestFile && tmpData.getIsTestSuiteDirectory()){
+				isInsideTestSuite=false
+			}
+			prevFile = existing;
+		}
+		else{
 			tmpUri = vscode.Uri.file(tmpDir);
 			tmpFile = controller.createTestItem(tmpDir, dirArr[i], tmpUri);
 			tmpData = new TestFile();
@@ -292,12 +299,6 @@ async function createDirectoryItems( controller:vscode.TestController, uri: vsco
 				}
 			}
 			prevFile=tmpFile;
-		}else{
-			const tmpData = testData.get(existing)
-			if(tmpData instanceof TestFile && tmpData.getIsTestSuiteDirectory()){
-				isInsideTestSuite=false
-			}
-			prevFile = existing;
 		}
 	}
 	return {tmpFile,tmpData};

diff --git a/vs-code-extension/client/src/services/CobolCheckInputParser.ts b/vs-code-extension/client/src/services/CobolCheckInputParser.ts
@@ -1,7 +1,6 @@
 import * as vscode from 'vscode';
 
 const testCaseRegex = /^\s*(TESTCASE)\s*(.*)/i;
-// const testRegex = /^\s*(Expect)\s*(.*)\s*(not?)\s(>|<|to\s*be)\s*(.*)\s*/i;
 const testSuiteRegex = /^\s*(TESTSUITE)\s*(.*)/i;
 
 export const parseMarkdown = (text: string, events: {