diff --git a/.azure-pipelines/signjars-rc.yml b/.azure-pipelines/signjars-rc.yml
index 4e51eff7..ebb333f7 100644
--- a/.azure-pipelines/signjars-rc.yml
+++ b/.azure-pipelines/signjars-rc.yml
@@ -74,7 +74,7 @@ extends:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
displayName: Sign core.jar
inputs:
- ConnectedServiceName: vscjavaci_codesign
+ ConnectedServiceName: vscjavaci_esrp_codesign
FolderPath: jars
Pattern: com.microsoft.java.debug.core*.jar
signConfigType: inlineSignParams
@@ -114,7 +114,7 @@ extends:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
displayName: Sign plugin.jar
inputs:
- ConnectedServiceName: vscjavaci_codesign
+ ConnectedServiceName: vscjavaci_esrp_codesign
FolderPath: jars
Pattern: com.microsoft.java.debug.plugin*.jar
signConfigType: inlineSignParams
@@ -155,7 +155,7 @@ extends:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
displayName: Sign p2
inputs:
- ConnectedServiceName: vscjavaci_codesign
+ ConnectedServiceName: vscjavaci_esrp_codesign
FolderPath: p2
Pattern: "*.jar"
signConfigType: inlineSignParams
@@ -202,7 +202,7 @@ extends:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
displayName: Sign m2
inputs:
- ConnectedServiceName: vscjavaci_codesign
+ ConnectedServiceName: vscjavaci_esrp_codesign
FolderPath: m2
Pattern: "*.jar"
signConfigType: inlineSignParams
diff --git a/com.microsoft.java.debug.core/pom.xml b/com.microsoft.java.debug.core/pom.xml
index cd41ea9b..a7c2ca8c 100644
--- a/com.microsoft.java.debug.core/pom.xml
+++ b/com.microsoft.java.debug.core/pom.xml
@@ -5,7 +5,7 @@
com.microsoft.java
java-debug-parent
- 0.51.0
+ 0.51.1
com.microsoft.java.debug.core
jar
diff --git a/com.microsoft.java.debug.plugin/.classpath b/com.microsoft.java.debug.plugin/.classpath
index 4d55efda..b4fb64d7 100644
--- a/com.microsoft.java.debug.plugin/.classpath
+++ b/com.microsoft.java.debug.plugin/.classpath
@@ -11,6 +11,6 @@
-
+
diff --git a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
index 077d85c9..73af47a6 100644
--- a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
+++ b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Java Debug Server Plugin
Bundle-SymbolicName: com.microsoft.java.debug.plugin;singleton:=true
-Bundle-Version: 0.51.0
+Bundle-Version: 0.51.1
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
@@ -25,4 +25,4 @@ Bundle-ClassPath: lib/commons-io-2.11.0.jar,
.,
lib/rxjava-2.2.21.jar,
lib/reactive-streams-1.0.4.jar,
- lib/com.microsoft.java.debug.core-0.51.0.jar
+ lib/com.microsoft.java.debug.core-0.51.1.jar
diff --git a/com.microsoft.java.debug.plugin/pom.xml b/com.microsoft.java.debug.plugin/pom.xml
index 68e29fa3..4657ab08 100644
--- a/com.microsoft.java.debug.plugin/pom.xml
+++ b/com.microsoft.java.debug.plugin/pom.xml
@@ -5,7 +5,7 @@
com.microsoft.java
java-debug-parent
- 0.51.0
+ 0.51.1
com.microsoft.java.debug.plugin
eclipse-plugin
@@ -56,7 +56,7 @@
com.microsoft.java
com.microsoft.java.debug.core
- 0.51.0
+ 0.51.1
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionProposalRequestor.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionProposalRequestor.java
index 1df752f2..431c283f 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionProposalRequestor.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionProposalRequestor.java
@@ -72,6 +72,8 @@ public final class CompletionProposalRequestor extends CompletionRequestor {
CompletionItemKind.Text);
// @formatter:on
+ private static boolean isFilterFailed = false;
+
/**
* Constructor.
* @param typeRoot ITypeRoot
@@ -321,7 +323,7 @@ private boolean isFiltered(CompletionProposal proposal) {
case CompletionProposal.JAVADOC_TYPE_REF:
case CompletionProposal.TYPE_REF: {
char[] declaringType = getDeclaringType(proposal);
- return declaringType != null && org.eclipse.jdt.ls.core.internal.contentassist.TypeFilter.isFiltered(declaringType);
+ return declaringType != null && isFiltered(declaringType);
}
default: // do nothing
}
@@ -332,6 +334,22 @@ private boolean isFiltered(CompletionProposal proposal) {
return false;
}
+ // Temp workaround for the completion error https://github.com/microsoft/java-debug/issues/534
+ private static boolean isFiltered(char[] fullTypeName) {
+ if (isFilterFailed) {
+ return false;
+ }
+
+ try {
+ return JavaLanguageServerPlugin.getInstance().getTypeFilter().filter(new String(fullTypeName));
+ } catch (NoSuchMethodError ex) {
+ isFilterFailed = true;
+ JavaLanguageServerPlugin.logException("isFiltered for the completion failed.", ex);
+ }
+
+ return false;
+ }
+
/**
* copied from
* org.eclipse.jdt.ui.text.java.CompletionProposalCollector.getDeclaringType(CompletionProposal)
diff --git a/com.microsoft.java.debug.repository/category.xml b/com.microsoft.java.debug.repository/category.xml
index 332d14f9..53e8bf96 100644
--- a/com.microsoft.java.debug.repository/category.xml
+++ b/com.microsoft.java.debug.repository/category.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/com.microsoft.java.debug.repository/pom.xml b/com.microsoft.java.debug.repository/pom.xml
index 314b894c..68ff9fc4 100644
--- a/com.microsoft.java.debug.repository/pom.xml
+++ b/com.microsoft.java.debug.repository/pom.xml
@@ -4,7 +4,7 @@
com.microsoft.java
java-debug-parent
- 0.51.0
+ 0.51.1
com.microsoft.java.debug.repository
eclipse-repository
diff --git a/com.microsoft.java.debug.target/com.microsoft.java.debug.tp.target b/com.microsoft.java.debug.target/com.microsoft.java.debug.tp.target
index 2e7920ed..828da98a 100644
--- a/com.microsoft.java.debug.target/com.microsoft.java.debug.tp.target
+++ b/com.microsoft.java.debug.target/com.microsoft.java.debug.tp.target
@@ -15,7 +15,10 @@
-
+
+
+
+
diff --git a/com.microsoft.java.debug.target/pom.xml b/com.microsoft.java.debug.target/pom.xml
index 42dbf272..6977f183 100644
--- a/com.microsoft.java.debug.target/pom.xml
+++ b/com.microsoft.java.debug.target/pom.xml
@@ -4,7 +4,7 @@
com.microsoft.java
java-debug-parent
- 0.51.0
+ 0.51.1
com.microsoft.java.debug.tp
${base.name} :: Target Platform
diff --git a/pom.xml b/pom.xml
index 46aece86..b039fe1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
${base.name} :: Parent
The Java Debug Server is an implementation of Visual Studio Code (VSCode) Debug Protocol. It can be used in Visual Studio Code to debug Java programs.
https://github.com/Microsoft/java-debug
- 0.51.0
+ 0.51.1
pom
Java Debug Server for Visual Studio Code
UTF-8
- 4.0.3
+ 4.0.5
${basedir}