From 72d2c8575259636159d6462d2634ad8f1f0e3cdc Mon Sep 17 00:00:00 2001
From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Wed, 12 Jul 2023 19:17:43 +0200
Subject: [PATCH] Polish

---
 .editorconfig            |  9 +++++++++
 .github/workflows/ci.yml | 11 ++++++++++-
 package.json             | 41 +++++-----------------------------------
 src/extension.ts         | 15 +--------------
 4 files changed, 25 insertions(+), 51 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d2bb147
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# Tab indentation
+[*]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[{package.json}]
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed07e7f..7d2dd1e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,9 +75,10 @@ jobs:
         run: cat ~/.m2/toolchains.xml
 
       - name: Setup Node version
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16
+          cache: 'npm'
           
       - name: 📦 Install dependencies
         run: npm ci
@@ -113,6 +114,14 @@ jobs:
             test/screenshots
             test/logs
 
+      - name: Upload Bazel JDT Language Server extension
+        uses: actions/upload-artifact@v3
+        if: success() && matrix.os == 'ubuntu-latest'
+        with:
+          name: server
+          path: server/
+          if-no-files-found: error
+    
   event_file:
     name: "Event File" 
     runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index c7a0c0c..ee22cde 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
-	"name": "bazel-vscode",
-	"displayName": "bazel-vscode",
-	"publisher": "salesforce",
-	"repository": "https://github.com/salesforce/bazel-vscode",
-	"description": "bazel-vscode",
+	"name": "bazel-vscode-java",
+	"displayName": "Bazel extension for Java(TM) Language Supportby Salesforce Engineering",
+	"publisher": "sfdc",
+	"repository": "https://github.com/salesforce/bazel-vscode-java",
+	"description": "Bazel support for Java Linting, Intellisense, formatting, refactoring and more...",
 	"version": "1.0.0",
 	"engines": {
 		"vscode": "^1.80.0"
@@ -13,8 +13,6 @@
 	],
 	"activationEvents": [
 		"onLanguage:java",
-		"onCommand:bazelimport.menus.viewtitle",
-		"onCommand:bazelimport.menus.explorercontext"
 	],
 	"main": "./dist/extension",
 	"contributes": {
@@ -58,38 +56,9 @@
 			}
 		},
 		"commands": [
-			{
-				"command": "bazelimport.menus.viewtitle",
-				"title": "Import Bazel Project"
-			}
 		],
 		"menus": {
-			"view/title": [
-				{
-					"command": "bazelimport.menus.viewtitle",
-					"group": "MenuViewTitle"
-				}
-			]
 		},
-		"taskDefinitions": [
-			{
-				"type": "bazel",
-				"required": [
-					"name",
-					"task"
-				],
-				"properties": {
-					"name": {
-						"type": "string",
-						"description": "The task name"
-					},
-					"task": {
-						"type": "string",
-						"description": "The task command"
-					}
-				}
-			}
-		]
 	},
 	"scripts": {
 		"build": "run-s build:server build:dev",
diff --git a/src/extension.ts b/src/extension.ts
index 7473d6e..46e0ec4 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1,21 +1,8 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
-import { BazelTaskProvider } from './bazelTaskProvider';
-
-let bazelTaskProvider: vscode.Disposable | undefined;
 
 export function activate(context: vscode.ExtensionContext) {
-	let panel: vscode.WebviewPanel | undefined = undefined;
-
-	console.log('Extension "bazelimport" is now active!');
-
-	bazelTaskProvider = vscode.tasks.registerTaskProvider(BazelTaskProvider.BazelType, new BazelTaskProvider());
-
 }
 
-// this method is called when your extension is deactivated
-export function deactivate() { 
-	if (bazelTaskProvider) {
-		bazelTaskProvider.dispose();
-	}
+export function deactivate() {
 }