Skip to content

Commit

Permalink
Polish
Browse files Browse the repository at this point in the history
  • Loading branch information
guw committed Jul 12, 2023
1 parent e162071 commit 72d2c85
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 51 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Tab indentation
[*]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true

[{package.json}]
indent_style = space
indent_size = 4
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
41 changes: 5 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -13,8 +13,6 @@
],
"activationEvents": [
"onLanguage:java",
"onCommand:bazelimport.menus.viewtitle",
"onCommand:bazelimport.menus.explorercontext"
],
"main": "./dist/extension",
"contributes": {
Expand Down Expand Up @@ -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",
Expand Down
15 changes: 1 addition & 14 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -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() {
}

0 comments on commit 72d2c85

Please sign in to comment.