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 @@ - 1.8 - 1.8 + 17 + 17 diff --git a/jdtls.ext/com.shengchen.checkstyle.runner/.classpath b/jdtls.ext/com.shengchen.checkstyle.runner/.classpath new file mode 100644 index 0000000..b49c6e1 --- /dev/null +++ b/jdtls.ext/com.shengchen.checkstyle.runner/.classpath @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/jdtls.ext/com.shengchen.checkstyle.runner/.project b/jdtls.ext/com.shengchen.checkstyle.runner/.project new file mode 100644 index 0000000..4612d0e --- /dev/null +++ b/jdtls.ext/com.shengchen.checkstyle.runner/.project @@ -0,0 +1,45 @@ + + + com.shengchen.checkstyle.runner + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + + + 1708997989680 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/jdtls.ext/com.shengchen.checkstyle.runner/.settings/org.eclipse.core.resources.prefs b/jdtls.ext/com.shengchen.checkstyle.runner/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/jdtls.ext/com.shengchen.checkstyle.runner/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/jdtls.ext/com.shengchen.checkstyle.runner/.settings/org.eclipse.m2e.core.prefs b/jdtls.ext/com.shengchen.checkstyle.runner/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/jdtls.ext/com.shengchen.checkstyle.runner/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/jdtls.ext/com.shengchen.checkstyle.runner/META-INF/MANIFEST.MF b/jdtls.ext/com.shengchen.checkstyle.runner/META-INF/MANIFEST.MF index 556614f..8210688 100644 --- a/jdtls.ext/com.shengchen.checkstyle.runner/META-INF/MANIFEST.MF +++ b/jdtls.ext/com.shengchen.checkstyle.runner/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: com.shengchen.checkstyle.runner Bundle-SymbolicName: com.shengchen.checkstyle.runner;singleton:=true Bundle-Version: 1.4.2 Bundle-Activator: com.shengchen.checkstyle.runner.CheckstylePlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.jdt.core, org.eclipse.jdt.launching, org.osgi.framework;version="1.3.0"