Merge pull request #519 from mezarin/updateToDevRel022Snapshot

New development version 0.2.2-SNAPSHOT
eclipse · Feb 23, 2024 · 31c868c · 31c868c
2 parents da30e70 + 7fa17dd
commit 31c868c
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 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
@@ -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
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
         <groupId>org.eclipse.lsp4jakarta</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>org.eclipse.lsp4jakarta.lsp4e.core</artifactId>
     <packaging>eclipse-plugin</packaging>
@@ -42,7 +42,7 @@
                                 <artifactItem>
                                     <groupId>org.eclipse.lsp4jakarta</groupId>
                                     <artifactId>org.eclipse.lsp4jakarta.ls</artifactId>
-                                    <version>0.2.1-SNAPSHOT</version>
+                                    <version>0.2.2-SNAPSHOT</version>
                                     <classifier>jar-with-dependencies</classifier>
                                 </artifactItem>
                             </artifactItems>

diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/feature.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.lsp4jakarta.lsp4e.feature"
       label="org.eclipse.lsp4jakarta.lsp4e Feature"
-      version="0.2.1.qualifier">
+      version="0.2.2.qualifier">
 
    <description url="http://www.example.com/description">
       [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
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
         <groupId>org.eclipse.lsp4jakarta</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>org.eclipse.lsp4jakarta.lsp4e.feature</artifactId>
     <packaging>eclipse-feature</packaging>

diff --git a/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml b/jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
         <groupId>org.eclipse.lsp4jakarta</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>org.eclipse.lsp4jakarta.lsp4e.site</artifactId>
     <packaging>eclipse-repository</packaging>

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
@@ -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
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
         <groupId>org.eclipse.lsp4jakarta</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.eclipse.lsp4jakarta.lsp4e.test</artifactId>

diff --git a/jakarta.eclipse/pom.xml b/jakarta.eclipse/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.lsp4jakarta</groupId>
     <artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Eclipse LSP4Jakarta LSP4E Parent</name>
     <description>Eclipse LSP4Jakarta LSP4E Parent</description>

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
@@ -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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.eclipse.lsp4jakarta</groupId>
         <artifactId>jdt-parent</artifactId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>org.eclipse.lsp4jakarta.jdt.core</artifactId>
     <packaging>eclipse-plugin</packaging>

diff --git a/...4jakarta.jdt.core/src/main/java/org/eclipse/lsp4jakarta/jdt/internal/DiagnosticUtils.java b/...4jakarta.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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.eclipse.lsp4jakarta</groupId>
         <artifactId>jdt-parent</artifactId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>org.eclipse.lsp4jakarta.jdt.site</artifactId>
     <packaging>eclipse-repository</packaging>

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
@@ -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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.eclipse.lsp4jakarta</groupId>
         <artifactId>jdt-parent</artifactId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.2-SNAPSHOT</version>
     </parent>
     <artifactId>org.eclipse.lsp4jakarta.jdt.test</artifactId>
     <packaging>eclipse-test-plugin</packaging>

diff --git a/jakarta.jdt/pom.xml b/jakarta.jdt/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.lsp4jakarta</groupId>
     <artifactId>jdt-parent</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Eclipse LSP4Jakarta JDT Plugin Parent</name>
     <description>Eclipse LSP4Jakarta JDT Plugin Parent</description>
@@ -18,7 +18,7 @@
         <connection>scm:git:[email protected]:eclipse/lsp4jakarta.git</connection>
         <developerConnection>scm:git:[email protected]:eclipse/lsp4jakarta.git</developerConnection>
         <url>[email protected]:eclipse/lsp4jakarta.git</url>
-        <tag>HEAD</tag>
+        <tag>0.2.2-SNAPSHOT</tag>
     </scm>
     <licenses>
         <license>

diff --git a/jakarta.ls/pom.xml b/jakarta.ls/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.lsp4jakarta</groupId>
     <artifactId>org.eclipse.lsp4jakarta.ls</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <name>Eclipse LSP4Jakarta Language Server</name>
     <description>Eclipse LSP4Jakarta Language Server</description>
     <organization>
@@ -17,7 +17,7 @@
         <connection>scm:git:[email protected]:eclipse/lsp4jakarta.git</connection>
         <developerConnection>scm:git:[email protected]:eclipse/lsp4jakarta.git</developerConnection>
         <url>[email protected]:eclipse/lsp4jakarta.git</url>
-        <tag>HEAD</tag>
+        <tag>0.2.2-SNAPSHOT</tag>
     </scm>
     <licenses>
         <license>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.eclipse.lsp4jakarta</groupId>
             <artifactId>org.eclipse.lsp4jakarta.jdt.core</artifactId>
-            <version>0.2.1-SNAPSHOT</version>
+            <version>0.2.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <pluginRepositories>