diff --git a/org.eclipse.wildwebdeveloper.feature/feature.xml b/org.eclipse.wildwebdeveloper.feature/feature.xml index 50533738c6..c9c8fa53df 100644 --- a/org.eclipse.wildwebdeveloper.feature/feature.xml +++ b/org.eclipse.wildwebdeveloper.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.wildwebdeveloper.feature/pom.xml b/org.eclipse.wildwebdeveloper.feature/pom.xml index e585991ce9..5c39ff4c6e 100644 --- a/org.eclipse.wildwebdeveloper.feature/pom.xml +++ b/org.eclipse.wildwebdeveloper.feature/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-feature - 1.3.7-SNAPSHOT + 1.3.8-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF index bdcfbb5dbd..e2151dbcc8 100644 --- a/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for WildWebDeveloper Bundle-SymbolicName: org.eclipse.wildwebdeveloper.tests;singleton:=true -Bundle-Version: 1.0.14.qualifier +Bundle-Version: 1.0.15.qualifier Bundle-Vendor: Eclipse Wild Web Developer Automatic-Module-Name: org.eclipse.wildwebdeveloper.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.wildwebdeveloper.tests/pom.xml b/org.eclipse.wildwebdeveloper.tests/pom.xml index fe8e828076..aae00eaac4 100644 --- a/org.eclipse.wildwebdeveloper.tests/pom.xml +++ b/org.eclipse.wildwebdeveloper.tests/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-test-plugin - 1.0.14-SNAPSHOT + 1.0.15-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestVue.java b/org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestVue.java index 161d110381..82577271ae 100644 --- a/org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestVue.java +++ b/org.eclipse.wildwebdeveloper.tests/src/org/eclipse/wildwebdeveloper/tests/TestVue.java @@ -13,6 +13,7 @@ package org.eclipse.wildwebdeveloper.tests; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.BufferedReader; @@ -142,7 +143,8 @@ void testVueTemplate() throws Exception { editor = (TextEditor) IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), appComponentHTML); IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput()); - String tag = ""; + String tagName = "only-start"; + String tag = '<' + tagName + '>'; document.set(document.get().replace(tag, tag + "<")); assertTrue(new DisplayHelper() { @Override @@ -174,7 +176,13 @@ protected boolean condition() { int pos = document.get().indexOf(tag) + tag.length(); ICompletionProposal[] proposals = contentAssistProcessor.computeCompletionProposals(Utils.getViewer(editor), pos + 1); - proposals[0].apply(document); + + // Find closing tag proposal + ICompletionProposal closingTagProposal = Arrays.stream(proposals) + .filter(p -> p.getDisplayString().equals('/' + tagName)).findFirst().orElse(null); + assertNotNull(closingTagProposal, "Closing tag proposal not found for '" + tag + "'"); + + closingTagProposal.apply(document); assertEquals(new String(componentFolder.getFile("HelloWorldCorrect.vue").getContents().readAllBytes()).trim(), document.get().trim(), "Incorrect completion insertion"); diff --git a/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF index 850c0ce453..b87e109895 100644 --- a/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.wildwebdeveloper;singleton:=true Automatic-Module-Name: org.eclipse.wildwebdeveloper -Bundle-Version: 1.2.3.qualifier +Bundle-Version: 1.2.4.qualifier Bundle-Activator: org.eclipse.wildwebdeveloper.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime;bundle-version="3.29.0", diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json index a920c6cde8..764e88f30b 100644 --- a/org.eclipse.wildwebdeveloper/package.json +++ b/org.eclipse.wildwebdeveloper/package.json @@ -11,8 +11,8 @@ "vscode-css-languageservice": "6.3.1", "vscode-html-languageservice": "5.3.1", "vscode-json-languageservice": "5.4.1", - "@vue/language-server" : "2.0.22", - "@vue/typescript-plugin" : "2.0.22", + "@vue/language-server" : "2.1.2", + "@vue/typescript-plugin" : "2.1.2", "fsevents" : "2.3.3", "vscode-css-languageserver": "file:target/vscode-css-languageserver-1.0.0.tgz", "vscode-html-languageserver": "file:target/vscode-html-languageserver-1.0.0.tgz", diff --git a/org.eclipse.wildwebdeveloper/pom.xml b/org.eclipse.wildwebdeveloper/pom.xml index 49fc397f0e..3957c96a48 100644 --- a/org.eclipse.wildwebdeveloper/pom.xml +++ b/org.eclipse.wildwebdeveloper/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT eclipse-plugin - 1.2.3-SNAPSHOT + 1.2.4-SNAPSHOT