Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/java-debug
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.51.0
Choose a base ref
...
head repository: microsoft/java-debug
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.51.1
Choose a head ref
  • 4 commits
  • 11 files changed
  • 1 contributor

Commits on Feb 6, 2024

  1. Fix build errors (#535)

    * Fix build errors
    testforstephen authored Feb 6, 2024
    Copy the full SHA
    b5bc37d View commit details

Commits on Feb 19, 2024

  1. Bump version to 0.51.1 (#536)

    testforstephen authored Feb 19, 2024
    Copy the full SHA
    f212c3a View commit details
  2. Update signjars-rc.yml for Azure Pipelines

    testforstephen committed Feb 19, 2024
    Copy the full SHA
    6e064b0 View commit details
  3. Update signjars-rc.yml for Azure Pipelines

    testforstephen committed Feb 19, 2024
    Copy the full SHA
    5f0d1bb View commit details
8 changes: 4 additions & 4 deletions .azure-pipelines/signjars-rc.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion com.microsoft.java.debug.core/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>com.microsoft.java</groupId>
<artifactId>java-debug-parent</artifactId>
<version>0.51.0</version>
<version>0.51.1</version>
</parent>
<artifactId>com.microsoft.java.debug.core</artifactId>
<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion com.microsoft.java.debug.plugin/.classpath
Original file line number Diff line number Diff line change
@@ -11,6 +11,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/rxjava-2.2.21.jar"/>
<classpathentry exported="true" kind="lib" path="lib/reactive-streams-1.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.51.0.jar" sourcepath="/com.microsoft.java.debug.core"/>
<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.51.1.jar" sourcepath="/com.microsoft.java.debug.core"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
4 changes: 2 additions & 2 deletions com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions com.microsoft.java.debug.plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>com.microsoft.java</groupId>
<artifactId>java-debug-parent</artifactId>
<version>0.51.0</version>
<version>0.51.1</version>
</parent>
<artifactId>com.microsoft.java.debug.plugin</artifactId>
<packaging>eclipse-plugin</packaging>
@@ -56,7 +56,7 @@
<artifactItem>
<groupId>com.microsoft.java</groupId>
<artifactId>com.microsoft.java.debug.core</artifactId>
<version>0.51.0</version>
<version>0.51.1</version>
</artifactItem>
</artifactItems>
</configuration>
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion com.microsoft.java.debug.repository/category.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<bundle id="com.microsoft.java.debug.plugin" version="0.51.0">
<bundle id="com.microsoft.java.debug.plugin" version="0.51.1">
<category name="javadebug" />
</bundle>
<category-def name="javadebug" label="Java Debug Server"/>
2 changes: 1 addition & 1 deletion com.microsoft.java.debug.repository/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.microsoft.java</groupId>
<artifactId>java-debug-parent</artifactId>
<version>0.51.0</version>
<version>0.51.1</version>
</parent>
<artifactId>com.microsoft.java.debug.repository</artifactId>
<packaging>eclipse-repository</packaging>
Original file line number Diff line number Diff line change
@@ -15,7 +15,10 @@
<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.apt.pluggable.core" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240130-1800/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
</location>
2 changes: 1 addition & 1 deletion com.microsoft.java.debug.target/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.microsoft.java</groupId>
<artifactId>java-debug-parent</artifactId>
<version>0.51.0</version>
<version>0.51.1</version>
</parent>
<artifactId>com.microsoft.java.debug.tp</artifactId>
<name>${base.name} :: Target Platform</name>
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@
<name>${base.name} :: Parent</name>
<description>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.</description>
<url>https://github.com/Microsoft/java-debug</url>
<version>0.51.0</version>
<version>0.51.1</version>
<packaging>pom</packaging>
<properties>
<base.name>Java Debug Server for Visual Studio Code</base.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho-version>4.0.3</tycho-version>
<tycho-version>4.0.5</tycho-version>
<checkstyleDir>${basedir}</checkstyleDir>
</properties>