From 7fa17dd4a3440e97dbf20bb1cfad512a04dcac88 Mon Sep 17 00:00:00 2001 From: Edward Mezarina Date: Fri, 23 Feb 2024 10:20:32 -0500 Subject: [PATCH] New development version 0.2.2-SNAPSHOT --- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.lsp4jakarta.lsp4e.core/pom.xml | 4 ++-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.lsp4jakarta.lsp4e.site/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.lsp4jakarta.lsp4e.test/pom.xml | 2 +- jakarta.eclipse/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.lsp4jakarta.jdt.core/pom.xml | 2 +- .../jdt/internal/DiagnosticUtils.java | 18 +++++++++--------- .../org.eclipse.lsp4jakarta.jdt.site/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.lsp4jakarta.jdt.test/pom.xml | 2 +- jakarta.jdt/pom.xml | 4 ++-- jakarta.ls/pom.xml | 6 +++--- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/META-INF/MANIFEST.MF b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/META-INF/MANIFEST.MF index 456e047f..f20e5e93 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/META-INF/MANIFEST.MF +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Eclipse LSP4Jakarta Plugin (Incubation) Bundle-Vendor: Eclipse LSP4Jakarta Bundle-SymbolicName: org.eclipse.lsp4jakarta.lsp4e.core;singleton:=true -Bundle-Version: 0.2.1.qualifier +Bundle-Version: 0.2.2.qualifier Bundle-Activator: org.eclipse.lsp4jakarta.lsp4e.Activator Require-Bundle: com.google.gson, diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/pom.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/pom.xml index 4ed708d2..2e169940 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/pom.xml +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta.lsp4e org.eclipse.lsp4jakarta - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT org.eclipse.lsp4jakarta.lsp4e.core eclipse-plugin @@ -42,7 +42,7 @@ org.eclipse.lsp4jakarta org.eclipse.lsp4jakarta.ls - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT jar-with-dependencies diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/feature.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/feature.xml index e19b2c1a..94615d3f 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/feature.xml +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/feature.xml @@ -2,7 +2,7 @@ + version="0.2.2.qualifier"> [Enter Feature Description here.] diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/pom.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/pom.xml index 594cfe57..2e52a2bf 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/pom.xml +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta.lsp4e org.eclipse.lsp4jakarta - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT org.eclipse.lsp4jakarta.lsp4e.feature eclipse-feature diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml index fb53b135..3ee51b65 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta.lsp4e org.eclipse.lsp4jakarta - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT org.eclipse.lsp4jakarta.lsp4e.site eclipse-repository diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/META-INF/MANIFEST.MF b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/META-INF/MANIFEST.MF index 720e3fa9..69508247 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/META-INF/MANIFEST.MF +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Eclipse LSP4Jakarta Plugin Test Fragment (Incubation) Bundle-Vendor: Eclipse LSP4Jakarta Bundle-SymbolicName: org.eclipse.lsp4jakarta.lsp4e.test -Bundle-Version: 0.2.1.qualifier +Bundle-Version: 0.2.2.qualifier Fragment-Host: org.eclipse.lsp4jakarta.lsp4e.core;bundle-version="0.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.jdt.junit4.runtime;bundle-version="1.1.0", diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/pom.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/pom.xml index 6ce12180..3b7428c8 100644 --- a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/pom.xml +++ b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta.lsp4e org.eclipse.lsp4jakarta - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT 4.0.0 org.eclipse.lsp4jakarta.lsp4e.test diff --git a/jakarta.eclipse/pom.xml b/jakarta.eclipse/pom.xml index 69e7cf81..3bf79427 100644 --- a/jakarta.eclipse/pom.xml +++ b/jakarta.eclipse/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.eclipse.lsp4jakarta org.eclipse.lsp4jakarta.lsp4e - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT pom Eclipse LSP4Jakarta LSP4E Parent Eclipse LSP4Jakarta LSP4E Parent diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/META-INF/MANIFEST.MF b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/META-INF/MANIFEST.MF index 31eebae2..8ea62f40 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/META-INF/MANIFEST.MF +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Eclipse LSP4Jakarta JDT Extension (Incubation) Bundle-Vendor: Eclipse LSP4Jakarta Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.lsp4jakarta.jdt.core;singleton:=true -Bundle-Version: 0.2.1.qualifier +Bundle-Version: 0.2.2.qualifier Bundle-Activator: org.eclipse.lsp4jakarta.jdt.core.JakartaCorePlugin Require-Bundle: org.eclipse.core.runtime, diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/pom.xml index d89ca575..4de41c2a 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/pom.xml +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta jdt-parent - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT org.eclipse.lsp4jakarta.jdt.core eclipse-plugin diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/internal/DiagnosticUtils.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/internal/DiagnosticUtils.java index 4af128a6..45f02329 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/internal/DiagnosticUtils.java +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/internal/DiagnosticUtils.java @@ -111,11 +111,11 @@ public static boolean isMatchedJavaElement(IType type, String javaElementName, S * otherwise. */ public static boolean isImportedJavaElement(ICompilationUnit unit, String javaElementFQName) throws JavaModelException { - - if (!unit.isOpen()) { - unit.open(null); - } - + + if (!unit.isOpen()) { + unit.open(null); + } + IImportContainer container = unit.getImportContainer(); if (container == null) { return false; @@ -147,10 +147,10 @@ public static boolean isImportedJavaElement(ICompilationUnit unit, String javaEl * false otherwise. */ protected static boolean isImportedJavaElement(ICompilationUnit unit, String[] javaElementFQNames) throws JavaModelException { - if (!unit.isOpen()) { - unit.open(null); - } - + if (!unit.isOpen()) { + unit.open(null); + } + IImportContainer container = unit.getImportContainer(); if (container == null) { return false; diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.site/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.site/pom.xml index 5daed97f..2b698aa2 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.site/pom.xml +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.site/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta jdt-parent - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT org.eclipse.lsp4jakarta.jdt.site eclipse-repository diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/META-INF/MANIFEST.MF b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/META-INF/MANIFEST.MF index 2ace7c85..d1aab7a1 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/META-INF/MANIFEST.MF +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Eclipse LSP4Jakarta JDT Test Plugin (Incubation) Bundle-Vendor: Eclipse LSP4Jakarta Bundle-SymbolicName: org.eclipse.lsp4jakarta.jdt.test -Bundle-Version: 0.2.1.qualifier +Bundle-Version: 0.2.2.qualifier Automatic-Module-Name: org.eclipse.lsp4jakarta.jdt.test Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/pom.xml index b8814cc8..fc9165bc 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/pom.xml +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lsp4jakarta jdt-parent - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT org.eclipse.lsp4jakarta.jdt.test eclipse-test-plugin diff --git a/jakarta.jdt/pom.xml b/jakarta.jdt/pom.xml index 6317ab39..427c20e5 100644 --- a/jakarta.jdt/pom.xml +++ b/jakarta.jdt/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.eclipse.lsp4jakarta jdt-parent - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT pom Eclipse LSP4Jakarta JDT Plugin Parent Eclipse LSP4Jakarta JDT Plugin Parent @@ -18,7 +18,7 @@ scm:git:git@github.com:eclipse/lsp4jakarta.git scm:git:git@github.com:eclipse/lsp4jakarta.git git@github.com:eclipse/lsp4jakarta.git - HEAD + 0.2.2-SNAPSHOT diff --git a/jakarta.ls/pom.xml b/jakarta.ls/pom.xml index 6976b84a..0be984ca 100644 --- a/jakarta.ls/pom.xml +++ b/jakarta.ls/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.eclipse.lsp4jakarta org.eclipse.lsp4jakarta.ls - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT Eclipse LSP4Jakarta Language Server Eclipse LSP4Jakarta Language Server @@ -17,7 +17,7 @@ scm:git:git@github.com:eclipse/lsp4jakarta.git scm:git:git@github.com:eclipse/lsp4jakarta.git git@github.com:eclipse/lsp4jakarta.git - HEAD + 0.2.2-SNAPSHOT @@ -64,7 +64,7 @@ org.eclipse.lsp4jakarta org.eclipse.lsp4jakarta.jdt.core - 0.2.1-SNAPSHOT + 0.2.2-SNAPSHOT