diff --git a/.gitignore b/.gitignore index 6b8dee4..15d8661 100644 --- a/.gitignore +++ b/.gitignore @@ -27,11 +27,6 @@ hs_err_pid* # build target/ -# Eclipse -.classpath -.project -.settings - # Checkstyle **/.checkstyle diff --git a/.vscode/extensions.json b/.vscode/extensions.json index efcf53c..570e2ef 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,7 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ - "ms-vscode.vscode-typescript-tslint-plugin", - "yaozheng.vscode-pde" + "yaozheng.vscode-pde", + "amodio.tsl-problem-matcher" ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a054b47..d61bf0c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,22 +4,7 @@ { "type": "npm", "script": "watch", - "problemMatcher": { - "owner": "typescript", - "pattern":[ - { - "regexp": "\\[tsl\\] ERROR", - "file": 1, - "location": 2, - "message": 3 - } - ], - "background": { - "activeOnStart": true, - "beginsPattern": "Compilation \\w+ starting…", - "endsPattern": "Compilation\\s+finished" - } - }, + "problemMatcher": ["$ts-webpack-watch", "$tslint-webpack-watch"], "isBackground": true, "presentation": { "reveal": "never" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9fd514e..7bf3091 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,13 +40,14 @@ The extension has three major modules, which are listed as follow: ### Setup 0. Make sure you have latest LTS JDK, Node.js, VS Code and [Java Extension Pack](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-pack) installed. -1. Fork and clone the repository: `git clone https://github.com/jdneo/vscode-checkstyle.git` -2. `cd vscode-checkstyle` -3. Install the node dependencies: `npm install` -4. Build the Java modules: `npm run build-plugin` -6. Open the directory `vscode-checkstyle` in VS Code -7. Install the [Eclipse PDE Support extension](https://marketplace.visualstudio.com/items?itemName=yaozheng.vscode-pde) in your VS Code -8. Open a Java file and wait until 👍 shows in the right-bottom of the status bar +1. Fork and clone the repository: `git clone https://github.com/jdneo/vscode-checkstyle.git`. +2. `cd vscode-checkstyle`. +3. Install the node dependencies: `npm install`. +4. Build the Java modules: `npm run build-plugin`. +6. Open the directory `vscode-checkstyle` in VS Code. +7. Install the [Eclipse PDE Support extension](https://marketplace.visualstudio.com/items?itemName=yaozheng.vscode-pde) in your VS Code. +8. Install the [TypeScript + Webpack Problem Matchers](https://marketplace.visualstudio.com/items?itemName=amodio.tsl-problem-matcher) in your VS Code. +9. Open a Java file and wait until 👍 shows in the right-bottom of the status bar > Note: Sometimes, if you find the code navigation is not working in the Java code, please try: > - right click the [target.target](https://github.com/jdneo/vscode-checkstyle/blob/master/jdtls.ext/com.shengchen.checkstyle.target/target.target) file and select `Reload Target Platform`. > - Reload your VS Code. diff --git a/README.md b/README.md index f68bbd7..b45906f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@
## Requirements -- JDK (version 1.8.0 or later) +- JDK (version 17 or later) - VS Code (version 1.30.0 or later) - [Language Support for Java by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java) diff --git a/jdtls.ext/com.shengchen.checkstyle.checker/pom.xml b/jdtls.ext/com.shengchen.checkstyle.checker/pom.xml index 3620fc9..53fef12 100644 --- a/jdtls.ext/com.shengchen.checkstyle.checker/pom.xml +++ b/jdtls.ext/com.shengchen.checkstyle.checker/pom.xml @@ -34,7 +34,7 @@