Fix - character must be non-negative in JAS issues with a location va…

…lue of 0 (#472)
jfrog · Apr 25, 2024 · 216b35a · 216b35a
1 parent e7b68c0
commit 216b35a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/main/scanLogic/scanManager.ts b/src/main/scanLogic/scanManager.ts
@@ -15,7 +15,7 @@ import { ScanResults } from '../types/workspaceIssuesDetails';
 import { DependencyUtils } from '../treeDataProviders/utils/dependencyUtils';
 import { PackageType } from '../types/projectType';
 import { UsageUtils } from '../utils/usageUtils';
-import { JasRunner } from './scanRunners/jasRunner';
+import { BinaryEnvParams, JasRunner } from './scanRunners/jasRunner';
 import { SupportedScans } from './sourceCodeScan/supportedScans';
 import { WorkspaceScanDetails } from '../types/workspaceScanDetails';
 import { Configuration } from '../utils/configuration';
@@ -105,10 +105,14 @@ export class ScanManager implements ExtensionComponent {
 
     private runSourceCodeScans(scanDetails: WorkspaceScanDetails, jasRunners: JasRunner[]): Promise<void>[] {
         const scansPromises: Promise<void>[] = [];
+        let params: BinaryEnvParams | undefined;
+        if (scanDetails.multiScanId) {
+            params = { msi: scanDetails.multiScanId };
+        }
         for (const runner of jasRunners) {
             if (runner.shouldRun()) {
                 scansPromises.push(
-                    runner.scan({ msi: scanDetails.multiScanId }).catch(error => {
+                    runner.scan(params).catch(error => {
                         LogUtils.logErrorWithAnalytics(error, this._connectionManager);
                         scanDetails.status = ScanEventStatus.Failed;
                     })

diff --git a/src/main/scanLogic/scanRunners/analyzerManager.ts b/src/main/scanLogic/scanRunners/analyzerManager.ts
@@ -153,7 +153,7 @@ export class AnalyzerManager {
             binaryVars.AM_LOG_DIRECTORY = params.executionLogDirectory;
         }
         // Optional Multi scan id
-        if (params?.msi) {
+        if (params?.msi && params.msi !== '') {
             binaryVars[AnalyzerManager.ENV_MSI] = params.msi;
         }
     }

diff --git a/src/main/treeDataProviders/issuesTree/codeFileTree/codeIssueTreeNode.ts b/src/main/treeDataProviders/issuesTree/codeFileTree/codeIssueTreeNode.ts
@@ -9,11 +9,7 @@ export abstract class CodeIssueTreeNode extends IssueTreeNode {
 
     constructor(issueId: string, private _parent: CodeFileTreeNode, region: vscode.Range, severity?: Severity, label?: string) {
         super(issueId, severity ?? Severity.Unknown, label ?? issueId, vscode.TreeItemCollapsibleState.None);
-        this._regionWithIssue = new vscode.Range(
-            // Analyzer locations minimum is 1, vscode positions starts at 0
-            new vscode.Position(region.start.line - 1, region.start.character - 1),
-            new vscode.Position(region.end.line - 1, region.end.character - 1)
-        );
+        this._regionWithIssue = new vscode.Range(this.toVscodePosition(region.start), this.toVscodePosition(region.end));
         this.description = 'line = ' + region.start.line + ', column = ' + region.start.character;
     }
 
@@ -24,4 +20,12 @@ export abstract class CodeIssueTreeNode extends IssueTreeNode {
     public get regionWithIssue(): vscode.Range {
         return this._regionWithIssue;
     }
+
+    // For vscode the minimum value (i.e first row/col) is 0. 
+    // For analyzers, the minimum value is 1. (some uses 0 as well)
+    private toVscodePosition(position: vscode.Position): vscode.Position {
+        let line: number = position.line > 0 ? position.line - 1 : 0;
+        let col: number = position.character > 0 ? position.character - 1 : 0;
+        return new vscode.Position(line, col);
+    }
 }