add support to choose tool

Author: hjrocha

package.json

@@ -3,6 +3,7 @@
 	"displayName": "codacy-cli-integration",
 	"description": "",
 	"version": "0.0.1",
+	"publisher": "Codacy",
 	"engines": {
 		"vscode": "^1.57.0"
 	},
@@ -23,23 +24,29 @@
 	},
 	"scripts": {
 		"vscode:prepublish": "npm run compile",
+		"vscode:prepublish2": "npm run -S esbuild-base -- --minify",
 		"compile": "tsc -p ./",
 		"watch": "tsc -watch -p ./",
 		"pretest": "npm run compile && npm run lint",
 		"lint": "eslint src --ext ts",
-		"test": "node ./out/test/runTest.js"
+		"test": "node ./out/test/runTest.js",
+		"esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
+		"esbuild": "npm run -S esbuild-base -- --sourcemap",
+		"esbuild-watch": "npm run -S esbuild-base -- --sourcemap --watch",
+		"test-compile": "tsc -p ./"
 	},
 	"devDependencies": {
-		"@types/vscode": "^1.57.0",
 		"@types/glob": "^7.1.3",
 		"@types/mocha": "^8.2.2",
 		"@types/node": "14.x",
-		"eslint": "^7.27.0",
+		"@types/vscode": "^1.57.0",
 		"@typescript-eslint/eslint-plugin": "^4.26.0",
 		"@typescript-eslint/parser": "^4.26.0",
+		"esbuild": "^0.12.9",
+		"eslint": "^7.27.0",
 		"glob": "^7.1.7",
 		"mocha": "^8.4.0",
 		"typescript": "^4.3.2",
 		"vscode-test": "^1.5.2"
 	}
-}
+}

src/extension.ts

@@ -8,44 +8,48 @@ export function activate(context: vscode.ExtensionContext) {
 	let disposable = vscode.commands.registerCommand('codacy-cli-integration.runCodacyCli', () => {
 		vscode.window.showInformationMessage('Codacy CLI has been launched!');
 
-		
+
 		if (vscode.workspace.workspaceFolders !== undefined && vscode.workspace.workspaceFolders.length > 0) {
 			let configuration = vscode.workspace.getConfiguration("codacy-cli");
-			const env: any = { env: { ...process.env } }
-			let additionalParameters = []
+			const env: any = { env: { ...process.env } };
+			let additionalParameters = [];
 			let diagnosticMap: Map<string, vscode.Diagnostic[]> = new Map();
 
 			//if user has api-token, it also needs to have 'provider', 'username' and 'project'
 			if (configuration.has('api-token')) {
 				if (configuration.has('provider') && configuration.has('username') && configuration.has('project')) {
-					env.env['CODACY_API_TOKEN'] = configuration.get('api-token')
+					env.env['CODACY_API_TOKEN'] = configuration.get('api-token');
 					additionalParameters.push(`--provider ${configuration.get('provider')}`);
 					additionalParameters.push(`--username ${configuration.get('username')}`);
 					additionalParameters.push(`--project ${configuration.get('project')}`);
 				} else {
 					vscode.window.showErrorMessage('You have an api-token but no provider, username or project so CLI will not consider the token');
 				}
 			} else if (configuration.has('project-token')) {
-				env.env['CODACY_PROJECT_TOKEN'] = configuration.get('project-token')
+				env.env['CODACY_PROJECT_TOKEN'] = configuration.get('project-token');
+			}
+
+			if (configuration.has('codacy-api-base-url')) {
+				env.env['env.CODACY_API_BASE_URL'] = configuration.get('codacy-api-base-url');
 			}
 
-			if(configuration.has('codacy-api-base-url')){
-				env.env['env.CODACY_API_BASE_URL'] = configuration.get('codacy-api-base-url')
+			if (configuration.has('tool')) {
+				additionalParameters.push(`--tool ${configuration.get('tool')}`);
 			}
 
 			for (let i = 0; i < vscode.workspace.workspaceFolders.length; i++) {
 				let workspaceFolder = vscode.workspace.workspaceFolders[i].uri.path;
-				env.env['CODACY_CODE'] = workspaceFolder
-				const dockerCommand = `docker run --rm=true --env CODACY_CODE="$CODACY_CODE" 	--volume /var/run/docker.sock:/var/run/docker.sock --volume "$CODACY_CODE":"$CODACY_CODE" --volume /tmp:/tmp codacy/codacy-analysis-cli analyze --format sarif ${additionalParameters.join(' ')}`
-				const cp = require('child_process')
+				env.env['CODACY_CODE'] = workspaceFolder;
+				const dockerCommand = `docker run --rm=true --env CODACY_CODE="$CODACY_CODE" 	--volume /var/run/docker.sock:/var/run/docker.sock --volume "$CODACY_CODE":"$CODACY_CODE" --volume /tmp:/tmp codacy/codacy-analysis-cli analyze --format sarif ${additionalParameters.join(' ')}`;
+				const cp = require('child_process');
 				cp.exec(
 					dockerCommand,
 					env,
 					(err: any, stdout: string, stderr: string) => {
-						if (err && err.code != 102) {
+						if (err && err.code !== 102) {
 							vscode.window.showErrorMessage(`Codacy CLI failed due to ${err.message}`);
 							console.log('error: ' + err);
-							return
+							return;
 						}
 						let sarifReport = JSON.parse(stdout);
 
@@ -64,21 +68,22 @@ export function activate(context: vscode.ExtensionContext) {
 							});
 
 						});
+						diagnosticCollection.clear();
 						diagnosticMap.forEach((diags, file) => {
 							diagnosticCollection.set(vscode.Uri.parse(file), diags);
 						});
 					});
 			}
 
 
-		}else {
+		} else {
 			vscode.window.showErrorMessage('There are no workspaces to analyze!');
 			return;
 		}
 
 
 
-		
+
 	});
 
 	context.subscriptions.push(disposable);