From 6396a4df2b6599aad3f37d24c8b6efba4301fec5 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Wed, 27 Jul 2022 16:05:14 +0800 Subject: [PATCH 1/2] chore: Remove unused module Signed-off-by: Sheng Chen --- .vscode/settings.json | 9 +++- javaConfig.json | 3 +- .../META-INF/MANIFEST.MF | 12 ----- .../build.properties | 5 -- .../plugin.xml | 5 -- .../com.microsoft.jdtls.ext.activator/pom.xml | 29 ----------- .../ext/activator/JdtlsExtActivator.java | 49 ------------------- jdtls.ext/pom.xml | 1 - 8 files changed, 9 insertions(+), 104 deletions(-) delete mode 100644 jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF delete mode 100644 jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties delete mode 100644 jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml delete mode 100644 jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml delete mode 100644 jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java diff --git a/.vscode/settings.json b/.vscode/settings.json index 7f19ff69..56a9603b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,12 @@ { "java.configuration.updateBuildConfiguration": "automatic", "java.checkstyle.configuration": "${workspaceFolder}/jdtls.ext/check_style.xml", - "java.checkstyle.version": "8.29" + "java.checkstyle.version": "8.29", + "java.import.exclusions": [ + "**/test/**", + "**/node_modules/**", + "**/.metadata/**", + "**/archetype-resources/**", + "**/META-INF/maven/**", + ] } diff --git a/javaConfig.json b/javaConfig.json index ac6a9020..5544d609 100644 --- a/javaConfig.json +++ b/javaConfig.json @@ -1,7 +1,6 @@ { "projects": [ - "./jdtls.ext/com.microsoft.jdtls.ext.core", - "./jdtls.ext/com.microsoft.jdtls.ext.activator" + "./jdtls.ext/com.microsoft.jdtls.ext.core" ], "targetPlatform": "./jdtls.ext/target.target" } diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF b/jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF deleted file mode 100644 index f25ad223..00000000 --- a/jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JDTLS EXT Activator -Bundle-SymbolicName: com.microsoft.jdtls.ext.activator;singleton:=true -Bundle-Version: 0.21.0 -Bundle-Activator: com.microsoft.jdtls.ext.activator.JdtlsExtActivator -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jdt.core, - org.osgi.framework;version="1.3.0" -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.jdt.ls.core -Bundle-ClassPath: . diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties b/jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties deleted file mode 100644 index e9863e28..00000000 --- a/jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml b/jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml deleted file mode 100644 index 5535690d..00000000 --- a/jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml b/jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml deleted file mode 100644 index d134a6a8..00000000 --- a/jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - com.microsoft.jdtls.ext - jdtls-ext-parent - 0.21.0 - - com.microsoft.jdtls.ext.activator - eclipse-plugin - ${base.name} :: JDTLS Ext Activator Plugin - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java b/jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java deleted file mode 100644 index 57e3c27b..00000000 --- a/jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2020 Microsoft Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Microsoft Corporation - initial API and implementation - *******************************************************************************/ - -package com.microsoft.jdtls.ext.activator; - -import org.eclipse.core.runtime.jobs.IJobChangeEvent; -import org.eclipse.core.runtime.jobs.IJobChangeListener; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.jdt.ls.core.internal.JavaClientConnection; -import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class JdtlsExtActivator implements BundleActivator { - - private static final String INITIALIZE_WORKSPACE_JOB_NAME = "Initialize workspace"; - private static final String JAVA_PROJECT_ACTIVATE_COMMAND = "java.project.activate"; - - private static IJobChangeListener jobChangeListener = new JobChangeAdapter() { - @Override - public void done(IJobChangeEvent event) { - if (!event.getJob().getName().contains(INITIALIZE_WORKSPACE_JOB_NAME)) { - return; - } - - JavaClientConnection connection = JavaLanguageServerPlugin.getInstance().getClientConnection(); - connection.executeClientCommand(JAVA_PROJECT_ACTIVATE_COMMAND); - } - }; - - @Override - public void start(BundleContext bundleContext) throws Exception { - Job.getJobManager().addJobChangeListener(jobChangeListener); - } - - @Override - public void stop(BundleContext bundleContext) throws Exception { - Job.getJobManager().removeJobChangeListener(jobChangeListener); - } -} diff --git a/jdtls.ext/pom.xml b/jdtls.ext/pom.xml index 2cc36567..2616f9d5 100644 --- a/jdtls.ext/pom.xml +++ b/jdtls.ext/pom.xml @@ -23,7 +23,6 @@ com.microsoft.jdtls.ext.core - com.microsoft.jdtls.ext.activator From e888a80c942df446427b5accb89d8fc604cbc9fc Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Wed, 27 Jul 2022 16:32:03 +0800 Subject: [PATCH 2/2] Add timeout --- test/suite/buildTask.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/suite/buildTask.test.ts b/test/suite/buildTask.test.ts index 8a4bab84..a861f73a 100644 --- a/test/suite/buildTask.test.ts +++ b/test/suite/buildTask.test.ts @@ -15,6 +15,7 @@ suite("Build Task Tests", () => { suiteSetup(setupTestEnv); test("test providing default build task", async function() { + this.timeout(60 * 1000 * 3); const vscodeTasks: Task[] = await tasks.fetchTasks(); const exportJarTask: Task | undefined = vscodeTasks.find((t: Task) => { return t.name === BuildTaskProvider.defaultTaskName