Merge branch 'main' into other/increase-coverage-unit-test

package.json

@@ -927,6 +927,7 @@
     "mocha": "10.3.0",
     "mock-require": "^3.0.3",
     "nyc": "^17.1.0",
+    "sinon": "^19.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3",
     "vsce": "^2.15.0",

src/asca/ascaService.ts

@@ -60,7 +60,7 @@ export async function clearAscaProblems() {
   diagnosticCollection.clear();
 }
 
-function updateProblems(scanAscaResult: CxAsca, uri: vscode.Uri) {
+export function updateProblems(scanAscaResult: CxAsca, uri: vscode.Uri) {
   diagnosticCollection.delete(uri);
   const diagnostics: vscode.Diagnostic[] = [];
 
@@ -69,12 +69,10 @@ function updateProblems(scanAscaResult: CxAsca, uri: vscode.Uri) {
 
     const problemText = res.problematicLine;
     const startIndex = problemText.length - problemText.trimStart().length;
-    const endIndex = startIndex + problemText.length;
-
 
     const range = new vscode.Range(
       new vscode.Position(res.line - 1, startIndex),
-      new vscode.Position(res.line - 1, endIndex)
+      new vscode.Position(res.line - 1, problemText.length)
     );
     const diagnostic: vscode.Diagnostic = new vscode.Diagnostic(
       range,

src/unit/ascaService.test.ts

@@ -0,0 +1,60 @@
+import { expect } from 'chai';
+import * as sinon from 'sinon';
+import './mocks/vscode-mock';
+import './mocks/cxWrapper-mock';
+import { mockDiagnosticCollection } from './mocks/vscode-mock';
+import { updateProblems } from '../asca/ascaService';
+import type CxAsca from "@checkmarxdev/ast-cli-javascript-wrapper/dist/main/asca/CxAsca";
+import type { Uri } from 'vscode';
+
+describe('ascaService', () => {
+    let mockUri: Uri;
+    let sandbox: sinon.SinonSandbox;
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox();
+        mockUri = {
+            fsPath: '/test/path',
+            scheme: 'file'
+        } as Uri;
+        mockDiagnosticCollection.set.reset();
+        mockDiagnosticCollection.delete.reset();
+    });
+
+    afterEach(() => {
+        sandbox.restore();
+    });
+
+    describe('updateProblems', () => {
+        it('should calculate correct range based on leading whitespace', () => {
+            const mockScanResult: CxAsca = {
+                scanDetails: [
+                    {
+                        line: 1,
+                        problematicLine: '  const unsafeCode = eval("2+2");',  // 2 spaces
+                        ruleName: 'Test Rule',
+                        remediationAdvise: 'Test Advice',
+                        severity: 'LOW'
+                    },
+                    {
+                        line: 2,
+                        problematicLine: '    console.log(secret);',  // 4 spaces
+                        ruleName: 'Test Rule 2',
+                        remediationAdvise: 'Test Advice 2',
+                        severity: 'LOW'
+                    }
+                ]
+            } as CxAsca;
+
+            updateProblems(mockScanResult, mockUri);
+
+            const diagnostics = mockDiagnosticCollection.set.getCall(0).args[1];
+
+            expect(diagnostics[0].range.start.character).to.equal(2);
+            expect(diagnostics[0].range.end.character).to.equal(33);
+
+            expect(diagnostics[1].range.start.character).to.equal(4);
+            expect(diagnostics[1].range.end.character).to.equal(24);
+        });
+    });
+});

src/unit/getScan.test.ts

@@ -2,8 +2,13 @@ import { expect } from "chai";
 import "./mocks/vscode-mock";
 import "./mocks/cxWrapper-mock";
 import { cx } from "../cx";
+import { resetMocks } from "./mocks/vscode-mock";
 
 describe("Cx - getScan", () => {
+  beforeEach(() => {
+    resetMocks();
+  });
+
   it("should return scan object when scanId is provided", async () => {
     const scanId = "1";
     const result = await cx.getScan(scanId);