Fix the activation events regression (#2608)

Signed-off-by: sheche <[email protected]>

Author: jdneo

package.json

@@ -40,12 +40,18 @@
   ],
   "activationEvents": [
     "onLanguage:java",
-    "workspaceContains:{*/,}pom.xml",
-    "workspaceContains:{*/,}build.gradle",
-    "workspaceContains:{*/,}settings.gradle",
-    "workspaceContains:{*/,}build.gradle.kts",
-    "workspaceContains:{*/,}settings.gradle.kts",
-    "workspaceContains:{*/,}.classpath",
+    "workspaceContains:pom.xml",
+    "workspaceContains:*/pom.xml",
+    "workspaceContains:build.gradle",
+    "workspaceContains:*/build.gradle",
+    "workspaceContains:settings.gradle",
+    "workspaceContains:*/settings.gradle",
+    "workspaceContains:build.gradle.kts",
+    "workspaceContains:*/build.gradle.kts",
+    "workspaceContains:settings.gradle.kts",
+    "workspaceContains:*/settings.gradle.kts",
+    "workspaceContains:.classpath",
+    "workspaceContains:*/.classpath",
     "onCommand:_java.templateVariables",
     "onCommand:_java.metadataFilesGeneration"
   ],

src/gradle/gradleCodeActionProvider.ts

@@ -26,7 +26,7 @@ export class GradleCodeActionProvider implements CodeActionProvider<CodeAction>
 		return [];
 	}
 
-	private async provideGradleCodeActions(document: TextDocument, diagnostics: readonly Diagnostic[]): Promise<CodeAction[]> {
+	async provideGradleCodeActions(document: TextDocument, diagnostics: readonly Diagnostic[]): Promise<CodeAction[]> {
 		const codeActions = [];
 		for (const diagnostic of diagnostics) {
 			if (diagnostic.message?.startsWith("The build file has been changed")) {

src/pom/pomCodeActionProvider.ts

@@ -20,7 +20,7 @@ export class PomCodeActionProvider implements CodeActionProvider<CodeAction> {
 		return undefined;
 	}
 
-	private collectCodeActions(document: TextDocument, diagnostics: readonly Diagnostic[]): CodeAction[] {
+	collectCodeActions(document: TextDocument, diagnostics: readonly Diagnostic[]): CodeAction[] {
 		const codeActions: CodeAction[] = [];
 		for (const diagnostic of diagnostics) {
 			if (diagnostic.message?.startsWith("Plugin execution not covered by lifecycle configuration")) {
@@ -62,7 +62,7 @@ export class PomCodeActionProvider implements CodeActionProvider<CodeAction> {
 		return codeActions;
 	}
 
-	private getNewTextIndentation(document: TextDocument, diagnostic: Diagnostic): string {
+	getNewTextIndentation(document: TextDocument, diagnostic: Diagnostic): string {
 		const textline = document.lineAt(diagnostic.range.end.line);
 		if (textline.text.lastIndexOf("</execution>") > diagnostic.range.end.character) {
 			return "";

test/standard-mode-suite/codeActionProvider.test.ts

@@ -2,6 +2,7 @@
 
 import * as assert from 'assert';
 import * as path from 'path';
+import * as sinon from 'sinon';
 import { CodeAction, CodeActionContext, CodeActionKind, CodeActionTriggerKind, DiagnosticSeverity, ExtensionContext, Position, Range, Uri, window } from "vscode";
 import { Commands } from '../../src/commands';
 import { GradleCodeActionProvider } from '../../src/gradle/gradleCodeActionProvider';
@@ -14,10 +15,10 @@ const gradleProjectFsPath: string = path.join(__dirname, '..', '..', '..', 'test
 suite('Code Action Provider Test', () => {
 
 	test('Provide reload project action on demand for pom file', async function () {
-		const contextMock = {
-			subscriptions: []
-		};
-		const provider = new PomCodeActionProvider(contextMock as ExtensionContext);
+		const provider = sinon.createStubInstance(PomCodeActionProvider);
+		provider.provideCodeActions.restore();
+		provider.getNewTextIndentation.restore();
+		provider.collectCodeActions.restore();
 
 		const codeActionContext: CodeActionContext = {
 			triggerKind: CodeActionTriggerKind.Invoke,
@@ -36,10 +37,9 @@ suite('Code Action Provider Test', () => {
 	});
 
 	test('Provide reload project action on demand for gradle file', async function () {
-		const contextMock = {
-			subscriptions: []
-		};
-		const provider = new GradleCodeActionProvider(contextMock as ExtensionContext);
+		const provider = sinon.createStubInstance(GradleCodeActionProvider);
+		provider.provideCodeActions.restore();
+		provider.provideGradleCodeActions.restore();
 
 		const codeActionContext: CodeActionContext = {
 			triggerKind: CodeActionTriggerKind.Invoke,

test/standard-mode-suite/extension.test.ts

@@ -15,9 +15,22 @@ suite('Java Language Extension - Standard', () => {
 		assert.ok(vscode.extensions.getExtension('redhat.java'));
 	});
 
-	test('should activate', function () {
+	test('should activate', async function () {
+		this.timeout(60000 * 2);
+		const ext = vscode.extensions.getExtension('redhat.java');
+		while (true) {
+			await new Promise(resolve => {
+				setTimeout(resolve, 5000);
+			});
+			if (ext.isActive) {
+				break;
+			}
+		}
+	});
+
+	test('should return api after activation', function () {
 		return vscode.extensions.getExtension('redhat.java').activate().then((api) => {
-			assert.ok(true);
+			assert.ok(!!api);
 		});
 	});