diff --git a/.azure-pipelines/publish-to-maven.yml b/.azure-pipelines/publish-to-maven.yml
new file mode 100644
index 000000000..a1ef0a204
--- /dev/null
+++ b/.azure-pipelines/publish-to-maven.yml
@@ -0,0 +1,104 @@
+name: $(Date:yyyyMMdd).$(Rev:r)
+resources:
+ repositories:
+ - repository: MicroBuildTemplate
+ type: git
+ name: 1ESPipelineTemplates/MicroBuildTemplate
+ ref: refs/tags/release
+trigger: none
+extends:
+ template: azure-pipelines/1ES.Official.Publish.yml@MicroBuildTemplate
+ parameters:
+ pool:
+ os: linux
+ name: 1ES_JavaTooling_Pool
+ image: 1ES_JavaTooling_Ubuntu-2004
+ sdl:
+ sourceAnalysisPool:
+ name: 1ES_JavaTooling_Pool
+ image: 1ES_JavaTooling_Windows_2022
+ os: windows
+ stages:
+ - stage: PublishToMaven
+ jobs:
+ - job: PublishToMaven
+ displayName: Maven Release job
+ templateContext:
+ type: releaseJob
+ isProduction: true
+ steps:
+ - task: DownloadBuildArtifacts@1
+ displayName: 'Download Jar Artifacts'
+ inputs:
+ buildType: specific
+ project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
+ pipeline: 16486
+ downloadType: specific
+ extractTars: false
+ itemPattern: 'm2/**'
+ - script: |
+ echo "import public key"
+ echo $GPG_PUBLIC_B64 | base64 -d | gpg --import
+
+ echo "import secret key"
+ echo $GPG_SECRET_B64 | base64 -d | gpg --batch --passphrase $GPGPASS --import
+ displayName: 'import GPG keys'
+ env:
+ GPG_PUBLIC_B64: $(GPG_PUBLIC_B64)
+ GPG_SECRET_B64: $(GPG_SECRET_B64)
+ GPGPASS: $(GPGPASS)
+ - task: NodeTool@0
+ displayName: 'Use Node 20.x'
+ inputs:
+ versionSpec: 20.x
+ - script: |
+ cd $(System.ArtifactsDirectory)/m2
+ pluginJarFile=$(basename -- java-debug-parent/*.pom)
+
+ # remove .* from end
+ noExt=${pluginJarFile%.*}
+
+ # remove *- from start
+ export releaseVersion=${noExt##*-}
+ echo $releaseVersion
+
+ export artifactFolder=$(pwd .)
+ wget https://raw.githubusercontent.com/microsoft/java-debug/master/scripts/publishMaven.js
+
+ export GPG_TTY=$(tty)
+ node publishMaven.js -task gpg
+ displayName: 'sign artifacts'
+ env:
+ GPG_PUBLIC_B64: $(GPG_PUBLIC_B64)
+ GPG_SECRET_B64: $(GPG_SECRET_B64)
+ GPGPASS: $(GPGPASS)
+ NEXUS_OSSRHPASS: $(NEXUS_OSSRHPASS)
+ NEXUS_OSSRHUSER: $(NEXUS_OSSRHUSER)
+ NEXUS_STAGINGPROFILEID: $(NEXUS_STAGINGPROFILEID)
+ - template: MicroBuild.Publish.yml@MicroBuildTemplate
+ parameters:
+ intent: 'PackageDistribution'
+ contentType: 'Maven'
+ contentSource: 'Folder'
+ folderLocation: '$(System.ArtifactsDirectory)/m2/java-debug-parent'
+ waitForReleaseCompletion: true
+ owners: 'jinbwan@microsoft.com'
+ approvers: 'roml@microsoft.com'
+ - template: MicroBuild.Publish.yml@MicroBuildTemplate
+ parameters:
+ intent: 'PackageDistribution'
+ contentType: 'Maven'
+ contentSource: 'Folder'
+ folderLocation: '$(System.ArtifactsDirectory)/m2/com.microsoft.java.debug.core'
+ waitForReleaseCompletion: true
+ owners: 'jinbwan@microsoft.com'
+ approvers: 'roml@microsoft.com'
+ - template: MicroBuild.Publish.yml@MicroBuildTemplate
+ parameters:
+ intent: 'PackageDistribution'
+ contentType: 'Maven'
+ contentSource: 'Folder'
+ folderLocation: '$(System.ArtifactsDirectory)/m2/com.microsoft.java.debug.plugin'
+ waitForReleaseCompletion: true
+ owners: 'jinbwan@microsoft.com'
+ approvers: 'roml@microsoft.com'
\ No newline at end of file
diff --git a/.azure-pipelines/signjars-nightly.yml b/.azure-pipelines/signjars-nightly.yml
new file mode 100644
index 000000000..8b1e8d12a
--- /dev/null
+++ b/.azure-pipelines/signjars-nightly.yml
@@ -0,0 +1,138 @@
+name: $(Date:yyyyMMdd).$(Rev:r)
+variables:
+ - name: Codeql.Enabled
+ value: true
+schedules:
+ - cron: 0 5 * * 1,2,3,4,5
+ branches:
+ include:
+ - refs/heads/main
+resources:
+ repositories:
+ - repository: self
+ type: git
+ ref: refs/heads/main
+ - repository: 1esPipelines
+ type: git
+ name: 1ESPipelineTemplates/1ESPipelineTemplates
+ ref: refs/tags/release
+trigger: none
+extends:
+ template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+ parameters:
+ pool:
+ os: linux
+ name: 1ES_JavaTooling_Pool
+ image: 1ES_JavaTooling_Ubuntu-2004
+ sdl:
+ sourceAnalysisPool:
+ name: 1ES_JavaTooling_Pool
+ image: 1ES_JavaTooling_Windows_2022
+ os: windows
+ customBuildTags:
+ - MigrationTooling-mseng-VSJava-13474-Tool
+ stages:
+ - stage: Build
+ jobs:
+ - job: Job_1
+ displayName: Sign-Jars-Nightly
+ templateContext:
+ outputs:
+ - output: pipelineArtifact
+ artifactName: plugin
+ targetPath: $(Build.ArtifactStagingDirectory)
+ displayName: "Publish Artifact: plugin"
+ steps:
+ - checkout: self
+ fetchTags: true
+ - task: UseDotNet@2
+ displayName: 'Use .NET Core 3.1.x'
+ inputs:
+ packageType: 'sdk'
+ version: '3.1.x'
+ - task: UseDotNet@2
+ displayName: 'Use .NET Core 8.0.x'
+ inputs:
+ packageType: 'sdk'
+ version: '8.0.x'
+ - task: MicroBuildSigningPlugin@4
+ displayName: 'Install Signing Plugin'
+ inputs:
+ signType: real
+ azureSubscription: 'MicroBuild Signing Task (MSEng)'
+ useEsrpCli: true
+ ConnectedPMEServiceName: 0e38ce24-f885-4c86-b997-5887b97a1899
+ feedSource: 'https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
+ - task: JavaToolInstaller@0
+ displayName: Use Java 21
+ inputs:
+ versionSpec: "21"
+ jdkArchitectureOption: x64
+ jdkSourceOption: PreInstalled
+ - task: CmdLine@2
+ displayName: Parse the release version from pom.xml
+ inputs:
+ script: |-
+ #!/bin/bash
+
+ sudo apt-get install xmlstarlet
+ xmlstarlet --version
+ RELEASE_VERSION=$(xmlstarlet sel -t -v "/_:project/_:version" pom.xml)
+ echo $RELEASE_VERSION
+ echo "##vso[task.setvariable variable=RELEASE_VERSION]$RELEASE_VERSION"
+ - task: CmdLine@2
+ displayName: Build core.jar
+ inputs:
+ script: |
+ ./mvnw clean install -f com.microsoft.java.debug.core/pom.xml -Dmaven.repo.local=./.repository
+
+ mkdir -p jars
+ mv .repository/com/microsoft/java/com.microsoft.java.debug.core/$RELEASE_VERSION/com.microsoft.java.debug.core*.jar jars/
+ - task: CmdLine@2
+ displayName: Sign core jars
+ inputs:
+ script: |
+ files=$(find . -type f -name "com.microsoft.java.debug.core*.jar")
+ for file in $files; do
+ fileName=$(basename "$file")
+ dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /file:"$fileName" /certs:100010171
+ done
+ workingDirectory: 'jars'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ - task: CmdLine@2
+ displayName: install signed core.jar
+ inputs:
+ script: cp jars/com.microsoft.java.debug.core*.jar .repository/com/microsoft/java/com.microsoft.java.debug.core/$RELEASE_VERSION/
+ - task: CmdLine@2
+ displayName: Build plugin.jar
+ inputs:
+ script: |-
+ ./mvnw clean install -N -f pom.xml -Dmaven.repo.local=./.repository
+ ./mvnw clean install -f com.microsoft.java.debug.target/pom.xml -Dmaven.repo.local=./.repository
+ ./mvnw clean install -f com.microsoft.java.debug.plugin/pom.xml -Dmaven.repo.local=./.repository
+
+ mkdir -p jars
+ mv .repository/com/microsoft/java/com.microsoft.java.debug.plugin/$RELEASE_VERSION/com.microsoft.java.debug.plugin*.jar jars/
+ - task: CmdLine@2
+ displayName: Sign plugin jars
+ inputs:
+ script: |
+ files=$(find . -type f -name "com.microsoft.java.debug.plugin*.jar")
+ for file in $files; do
+ fileName=$(basename "$file")
+ dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /file:"$fileName" /certs:100010171
+ done
+ workingDirectory: 'jars'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ - task: CopyFiles@2
+ displayName: "Copy plugin.jar to: $(Build.ArtifactStagingDirectory)"
+ inputs:
+ Contents: |+
+ jars/com.microsoft.java.debug.plugin*.jar
+
+ TargetFolder: $(Build.ArtifactStagingDirectory)
diff --git a/.azure-pipelines/signjars-rc.yml b/.azure-pipelines/signjars-rc.yml
new file mode 100644
index 000000000..e87444603
--- /dev/null
+++ b/.azure-pipelines/signjars-rc.yml
@@ -0,0 +1,169 @@
+name: $(Date:yyyyMMdd).$(Rev:r)
+variables:
+ - name: Codeql.Enabled
+ value: true
+resources:
+ repositories:
+ - repository: self
+ type: git
+ ref: refs/heads/main
+ - repository: 1esPipelines
+ type: git
+ name: 1ESPipelineTemplates/1ESPipelineTemplates
+ ref: refs/tags/release
+trigger: none
+extends:
+ template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+ parameters:
+ pool:
+ os: linux
+ name: 1ES_JavaTooling_Pool
+ image: 1ES_JavaTooling_Ubuntu-2004
+ sdl:
+ sourceAnalysisPool:
+ name: 1ES_JavaTooling_Pool
+ image: 1ES_JavaTooling_Windows_2022
+ os: windows
+ customBuildTags:
+ - MigrationTooling-mseng-VSJava-9151-Tool
+ stages:
+ - stage: Build
+ jobs:
+ - job: Job_1
+ displayName: Sign-Jars-RC
+ templateContext:
+ outputs:
+ - output: pipelineArtifact
+ artifactName: m2
+ targetPath: $(Build.ArtifactStagingDirectory)/m2
+ displayName: "Publish Artifact: m2"
+ steps:
+ - checkout: self
+ fetchTags: true
+ - task: UseDotNet@2
+ displayName: 'Use .NET Core 3.1.x'
+ inputs:
+ packageType: 'sdk'
+ version: '3.1.x'
+ - task: UseDotNet@2
+ displayName: 'Use .NET Core 8.0.x'
+ inputs:
+ packageType: 'sdk'
+ version: '8.0.x'
+ - task: MicroBuildSigningPlugin@4
+ displayName: 'Install Signing Plugin'
+ inputs:
+ signType: real
+ azureSubscription: 'MicroBuild Signing Task (MSEng)'
+ useEsrpCli: true
+ ConnectedPMEServiceName: 0e38ce24-f885-4c86-b997-5887b97a1899
+ feedSource: 'https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
+ - task: JavaToolInstaller@0
+ displayName: Use Java 21
+ inputs:
+ versionSpec: "21"
+ jdkArchitectureOption: x64
+ jdkSourceOption: PreInstalled
+ - task: CmdLine@2
+ displayName: Parse the release version from pom.xml
+ inputs:
+ script: |-
+ #!/bin/bash
+
+ sudo apt-get install xmlstarlet
+ xmlstarlet --version
+ RELEASE_VERSION=$(xmlstarlet sel -t -v "/_:project/_:version" pom.xml)
+ echo $RELEASE_VERSION
+ echo "##vso[task.setvariable variable=RELEASE_VERSION]$RELEASE_VERSION"
+ - task: CmdLine@2
+ displayName: Build core.jar
+ inputs:
+ script: |
+ ./mvnw -N clean install -Dmaven.repo.local=./.repository
+
+ ./mvnw clean install -f com.microsoft.java.debug.core/pom.xml -Dmaven.repo.local=./.repository
+
+ mkdir -p jars
+ mv .repository/com/microsoft/java/com.microsoft.java.debug.core/$RELEASE_VERSION/com.microsoft.java.debug.core*.jar jars/
+ - task: CmdLine@2
+ displayName: Sign core jars
+ inputs:
+ script: |
+ files=$(find . -type f -name "com.microsoft.java.debug.core*.jar")
+ for file in $files; do
+ fileName=$(basename "$file")
+ dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /file:"$fileName" /certs:100010171
+ done
+ workingDirectory: 'jars'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ - task: CmdLine@2
+ displayName: install signed core.jar
+ inputs:
+ script: cp jars/com.microsoft.java.debug.core*.jar .repository/com/microsoft/java/com.microsoft.java.debug.core/$RELEASE_VERSION/
+ - task: CmdLine@2
+ displayName: Build plugin.jar
+ inputs:
+ script: |-
+ ./mvnw clean install -f com.microsoft.java.debug.target/pom.xml -Dmaven.repo.local=./.repository
+ ./mvnw clean install -f com.microsoft.java.debug.plugin/pom.xml -Dmaven.repo.local=./.repository
+
+ mkdir -p jars
+ mv .repository/com/microsoft/java/com.microsoft.java.debug.plugin/$RELEASE_VERSION/com.microsoft.java.debug.plugin*.jar jars/
+ - task: CmdLine@2
+ displayName: Sign plugin jars
+ inputs:
+ script: |
+ files=$(find . -type f -name "com.microsoft.java.debug.plugin*.jar")
+ for file in $files; do
+ fileName=$(basename "$file")
+ dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /file:"$fileName" /certs:100010171
+ done
+ workingDirectory: 'jars'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ - task: CmdLine@2
+ displayName: install signed plugin.jar
+ inputs:
+ script: cp jars/com.microsoft.java.debug.plugin*.jar .repository/com/microsoft/java/com.microsoft.java.debug.plugin/$RELEASE_VERSION/
+ - task: CmdLine@2
+ displayName: build m2 artifacts
+ inputs:
+ script: |
+ ./mvnw source:jar -f com.microsoft.java.debug.core/pom.xml -Dmaven.repo.local=./.repository
+ ./mvnw javadoc:jar -f com.microsoft.java.debug.core/pom.xml -Ddoclint=none -Dmaven.repo.local=./.repository
+
+ ./mvnw source:jar -f com.microsoft.java.debug.plugin/pom.xml -Dmaven.repo.local=./.repository
+ ./mvnw javadoc:jar -f com.microsoft.java.debug.plugin/pom.xml -Ddoclint=none -Dmaven.repo.local=./.repository
+
+ mkdir -p m2/java-debug-parent
+ cp pom.xml m2/java-debug-parent/java-debug-parent-$RELEASE_VERSION.pom
+
+ mkdir -p m2/com.microsoft.java.debug.core
+ cp com.microsoft.java.debug.core/target/com.microsoft.java.debug.core*.jar m2/com.microsoft.java.debug.core
+ cp com.microsoft.java.debug.core/pom.xml m2/com.microsoft.java.debug.core/com.microsoft.java.debug.core-$RELEASE_VERSION.pom
+
+ mkdir -p m2/com.microsoft.java.debug.plugin
+ cp com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin*.jar m2/com.microsoft.java.debug.plugin
+ cp com.microsoft.java.debug.plugin/pom.xml m2/com.microsoft.java.debug.plugin/com.microsoft.java.debug.plugin-$RELEASE_VERSION.pom
+ - task: CmdLine@2
+ displayName: Sign m2 jars
+ inputs:
+ script: |
+ files=$(find . -type f -name "*.jar")
+ for file in $files; do
+ # fileName=$(basename "$file")
+ dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /file:"$file" /certs:100010171
+ done
+ workingDirectory: 'm2'
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ - task: CopyFiles@2
+ displayName: "Copy m2 to: $(Build.ArtifactStagingDirectory)"
+ inputs:
+ Contents: |+
+ m2/**
+ TargetFolder: $(Build.ArtifactStagingDirectory)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..9d7579633
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @testforstephen @jdneo @chagong @wenytang-ms
diff --git a/.github/llms.md b/.github/llms.md
new file mode 100644
index 000000000..55d69b238
--- /dev/null
+++ b/.github/llms.md
@@ -0,0 +1,38 @@
+# Extension Pack for Java
+Extension Pack for Java is a collection of popular extensions that can help write, test and debug Java applications in Visual Studio Code. By installing Extension Pack for Java, the following extensions are installed:
+
+- [📦 Language Support for Java™ by Red Hat ](https://marketplace.visualstudio.com/items?itemName=redhat.java)
+ - Code Navigation
+ - Auto Completion
+ - Refactoring
+ - Code Snippets
+- [📦 Debugger for Java](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-debug)
+ - Debugging
+- [📦 Test Runner for Java](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-test)
+ - Run & Debug JUnit/TestNG Test Cases
+- [📦 Maven for Java](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-maven)
+ - Project Scaffolding
+ - Custom Goals
+- [📦 Gradle for Java](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-gradle)
+ - View Gradle tasks and project dependencies
+ - Gradle file authoring
+ - Import Gradle projects via [Gradle Build Server](https://github.com/microsoft/build-server-for-gradle)
+- [📦 Project Manager for Java](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-dependency)
+ - Manage Java projects, referenced libraries, resource files, packages, classes, and class members
+- [📦 Visual Studio IntelliCode](https://marketplace.visualstudio.com/items?itemName=VisualStudioExptTeam.vscodeintellicode)
+ - AI-assisted development
+ - Completion list ranked by AI
+
+## Label
+When labeling an issue, follow the rules below per label category:
+### General Rules
+- Analyze if the issue is related with the scope of using extensions for Java development. If not, STOP labelling IMMEDIATELY.
+- Assign label per category.
+- If a category is not applicable or you're unsure, you may skip it.
+- Do not assign multiple labels within the same category, unless explicitly allowed as an exception.
+
+### Issue Type Labels
+- [bug]: Primary label for real bug issues
+- [enhancement]: Primary label for enhancement issues
+- [documentation]: Primary label for documentation issues
+- [question]: Primary label for question issues
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41c85cb62..553d95a9a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,80 +12,83 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v5
- - name: Set up JDK 17
- uses: actions/setup-java@v1
- with:
- java-version: '17'
+ - name: Set up JDK 21
+ uses: actions/setup-java@v5
+ with:
+ java-version: '21'
+ distribution: 'temurin'
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
+ - name: Cache local Maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
- - name: Verify
- run: ./mvnw clean verify
+ - name: Verify
+ run: ./mvnw clean verify -U
- - name: Checkstyle
- run: ./mvnw checkstyle:check
+ - name: Checkstyle
+ run: ./mvnw checkstyle:check
windows:
name: Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
- - name: Set git to use LF
- run: |
- git config --global core.autocrlf false
- git config --global core.eol lf
+ - name: Set git to use LF
+ run: |
+ git config --global core.autocrlf false
+ git config --global core.eol lf
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v5
- - name: Set up JDK 17
- uses: actions/setup-java@v1
- with:
- java-version: '17'
+ - name: Set up JDK 21
+ uses: actions/setup-java@v5
+ with:
+ java-version: '21'
+ distribution: 'temurin'
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: $HOME/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
+ - name: Cache local Maven repository
+ uses: actions/cache@v4
+ with:
+ path: $HOME/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
- - name: Verify
- run: ./mvnw.cmd clean verify
+ - name: Verify
+ run: ./mvnw.cmd clean verify
- - name: Checkstyle
- run: ./mvnw.cmd checkstyle:check
+ - name: Checkstyle
+ run: ./mvnw.cmd checkstyle:check
darwin:
name: macOS
runs-on: macos-latest
timeout-minutes: 30
steps:
- - uses: actions/checkout@v2
-
- - name: Set up JDK 17
- uses: actions/setup-java@v1
- with:
- java-version: '17'
-
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
-
- - name: Verify
- run: ./mvnw clean verify
-
- - name: Checkstyle
- run: ./mvnw checkstyle:check
+ - uses: actions/checkout@v5
+
+ - name: Set up JDK 21
+ uses: actions/setup-java@v5
+ with:
+ java-version: '21'
+ distribution: 'temurin'
+
+ - name: Cache local Maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+
+ - name: Verify
+ run: ./mvnw clean verify -U
+
+ - name: Checkstyle
+ run: ./mvnw checkstyle:check
diff --git a/.github/workflows/triage-agent.yml b/.github/workflows/triage-agent.yml
new file mode 100644
index 000000000..f1df6e117
--- /dev/null
+++ b/.github/workflows/triage-agent.yml
@@ -0,0 +1,125 @@
+name: AI Triage
+on:
+ issues:
+ types: [opened]
+ workflow_dispatch:
+ inputs:
+ issue_number:
+ description: 'Issue number to triage (manual run). e.g. 123'
+ required: true
+
+run-name: >-
+ AI Triage for Issue #${{ github.event.issue.number || github.event.inputs.issue_number }}
+
+permissions:
+ issues: write
+ contents: read
+
+jobs:
+ label_and_comment:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ - name: Get issue data
+ id: get_issue
+ uses: actions/github-script@v6
+ with:
+ script: |
+ const eventName = context.eventName;
+ let issue;
+ if (eventName === 'workflow_dispatch') {
+ const inputs = context.payload.inputs || {};
+ const issueNumber = inputs.issue_number || inputs.issueNumber;
+ if (!issueNumber) core.setFailed('Input issue_number is required for manual run.');
+ const { data } = await github.rest.issues.get({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ issue_number: parseInt(issueNumber, 10),
+ });
+ issue = data;
+ } else if (context.payload.issue) {
+ issue = context.payload.issue;
+ } else {
+ core.setFailed('No issue information found in the event payload.');
+ }
+ core.setOutput('id', String(issue.number));
+ core.setOutput('user', String((issue.user && issue.user.login) || ''));
+ core.setOutput('title', String(issue.title || ''));
+ core.setOutput('body', String(issue.body || ''));
+ const labelNames = (issue.labels || []).map(label => label.name);
+ core.setOutput('labels', JSON.stringify(labelNames));
+
+ - name: Call Azure Function
+ id: call_azure_function
+ env:
+ PAYLOAD: >-
+ {
+ "authToken": "${{ secrets.GITHUB_TOKEN }}",
+ "repoId": "microsoft/java-debug",
+ "issueData": {
+ "id": ${{ steps.get_issue.outputs.id }},
+ "user": ${{ toJson(steps.get_issue.outputs.user) }},
+ "title": ${{ toJson(steps.get_issue.outputs.title) }},
+ "body": ${{ toJson(steps.get_issue.outputs.body) }},
+ "labels": ${{ steps.get_issue.outputs.labels }}
+ },
+ "mode": "DirectUpdate"
+ }
+
+ run: |
+ # Make the HTTP request with improved error handling and timeouts
+ echo "Making request to triage agent..."
+
+ # Add timeout handling and better error detection
+ set +e # Don't exit on curl failure
+ response=$(timeout ${{ vars.TRIAGE_AGENT_TIMEOUT }} curl \
+ --max-time 0 \
+ --connect-timeout 30 \
+ --fail-with-body \
+ --silent \
+ --show-error \
+ --write-out "HTTPSTATUS:%{http_code}" \
+ --header "Content-Type: application/json" \
+ --request POST \
+ --data "$PAYLOAD" \
+ ${{ secrets.TRIAGE_FUNCTION_LINK }} 2>&1)
+
+ curl_exit_code=$?
+ set -e # Re-enable exit on error
+
+ echo "Curl exit code: $curl_exit_code"
+
+ # Check if curl command timed out or failed
+ if [ $curl_exit_code -eq 124 ]; then
+ echo "❌ Request timed out after 650 seconds"
+ exit 1
+ elif [ $curl_exit_code -ne 0 ]; then
+ echo "❌ Curl command failed with exit code: $curl_exit_code"
+ echo "Response: $response"
+ exit 1
+ fi
+
+ # Extract HTTP status code and response body
+ http_code=$(echo "$response" | grep -o "HTTPSTATUS:[0-9]*" | cut -d: -f2)
+ response_body=$(echo "$response" | sed 's/HTTPSTATUS:[0-9]*$//')
+
+ echo "HTTP Status Code: $http_code"
+
+ # Validate HTTP status code
+ if [ -z "$http_code" ]; then
+ echo "❌ Failed to extract HTTP status code from response"
+ echo "Raw response: $response"
+ exit 1
+ fi
+
+ # Check if the request was successful
+ if [ "$http_code" -ge 200 ] && [ "$http_code" -lt 300 ]; then
+ echo "✅ Azure Function call succeeded"
+ else
+ echo "❌ Azure Function call failed with status code: $http_code"
+ echo "Response: $response_body"
+ exit 1
+ fi
\ No newline at end of file
diff --git a/.github/workflows/triage-all-open-issues.yml b/.github/workflows/triage-all-open-issues.yml
new file mode 100644
index 000000000..092f4ef70
--- /dev/null
+++ b/.github/workflows/triage-all-open-issues.yml
@@ -0,0 +1,145 @@
+name: AI Triage - Process All Open Issues
+on:
+ workflow_dispatch:
+ inputs:
+ dry_run:
+ description: 'Dry run mode - only list issues without processing'
+ required: false
+ default: false
+ type: boolean
+ max_issues:
+ description: 'Maximum number of issues to process (0 = all)'
+ required: false
+ default: '0'
+ type: string
+
+permissions:
+ issues: write
+ contents: read
+ actions: write
+
+jobs:
+ get_open_issues:
+ runs-on: ubuntu-latest
+ outputs:
+ issue_numbers: ${{ steps.get_issues.outputs.issue_numbers }}
+ total_count: ${{ steps.get_issues.outputs.total_count }}
+
+ steps:
+ - name: Get all open issues
+ id: get_issues
+ uses: actions/github-script@v6
+ with:
+ script: |
+ // Use Search API to filter issues at API level
+ const { data } = await github.rest.search.issuesAndPullRequests({
+ q: `repo:${context.repo.owner}/${context.repo.repo} is:issue is:open -label:ai-triaged -label:invalid`,
+ sort: 'created',
+ order: 'asc',
+ per_page: 100
+ });
+
+ const actualIssues = data.items;
+
+ let issuesToProcess = actualIssues;
+ const maxIssues = parseInt('${{ inputs.max_issues }}' || '0');
+
+ if (maxIssues > 0 && actualIssues.length > maxIssues) {
+ issuesToProcess = actualIssues.slice(0, maxIssues);
+ console.log(`Limiting to first ${maxIssues} issues out of ${actualIssues.length} total`);
+ }
+
+ const issueNumbers = issuesToProcess.map(issue => issue.number);
+ const totalCount = issuesToProcess.length;
+
+ console.log(`Found ${actualIssues.length} open issues, processing ${totalCount}:`);
+ issuesToProcess.forEach(issue => {
+ console.log(` #${issue.number}: ${issue.title}`);
+ });
+
+ core.setOutput('issue_numbers', JSON.stringify(issueNumbers));
+ core.setOutput('total_count', totalCount);
+
+ process_issues:
+ runs-on: ubuntu-latest
+ needs: get_open_issues
+ if: needs.get_open_issues.outputs.total_count > 0
+
+ strategy:
+ # Process issues one by one (max-parallel: 1)
+ max-parallel: 1
+ matrix:
+ issue_number: ${{ fromJSON(needs.get_open_issues.outputs.issue_numbers) }}
+
+ steps:
+ - name: Log current issue being processed
+ run: |
+ echo "🔄 Processing issue #${{ matrix.issue_number }}"
+ echo "Total issues to process: ${{ needs.get_open_issues.outputs.total_count }}"
+
+ - name: Check if dry run mode
+ if: inputs.dry_run == true
+ run: |
+ echo "🔍 DRY RUN MODE: Would process issue #${{ matrix.issue_number }}"
+ echo "Skipping actual triage processing"
+
+ - name: Trigger triage workflow for issue
+ if: inputs.dry_run != true
+ uses: actions/github-script@v6
+ with:
+ script: |
+ const issueNumber = '${{ matrix.issue_number }}';
+
+ try {
+ console.log(`Triggering triage workflow for issue #${issueNumber}`);
+
+ const response = await github.rest.actions.createWorkflowDispatch({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ workflow_id: 'triage-agent.yml',
+ ref: 'main',
+ inputs: {
+ issue_number: issueNumber
+ }
+ });
+
+ console.log(`✅ Successfully triggered triage workflow for issue #${issueNumber}`);
+
+ } catch (error) {
+ console.error(`❌ Failed to trigger triage workflow for issue #${issueNumber}:`, error);
+ core.setFailed(`Failed to process issue #${issueNumber}: ${error.message}`);
+ }
+
+ - name: Wait for workflow completion
+ if: inputs.dry_run != true
+ run: |
+ echo "⏳ Waiting for triage workflow to complete for issue #${{ matrix.issue_number }}..."
+ echo "Timeout: ${{ vars.TRIAGE_AGENT_TIMEOUT }} seconds"
+ sleep ${{ vars.TRIAGE_AGENT_TIMEOUT }} # Wait for triage workflow completion
+
+ summary:
+ runs-on: ubuntu-latest
+ needs: [get_open_issues, process_issues]
+ if: always()
+
+ steps:
+ - name: Print summary
+ run: |
+ echo "## Triage Processing Summary"
+ echo "Total open issues found: ${{ needs.get_open_issues.outputs.total_count }}"
+
+ if [ "${{ inputs.dry_run }}" == "true" ]; then
+ echo "Mode: DRY RUN (no actual processing performed)"
+ else
+ echo "Mode: FULL PROCESSING"
+ fi
+
+ if [ "${{ needs.process_issues.result }}" == "success" ]; then
+ echo "✅ All issues processed successfully"
+ elif [ "${{ needs.process_issues.result }}" == "failure" ]; then
+ echo "❌ Some issues failed to process"
+ elif [ "${{ needs.process_issues.result }}" == "skipped" ]; then
+ echo "⏭️ Processing was skipped (no open issues found)"
+ else
+ echo "⚠️ Processing completed with status: ${{ needs.process_issues.result }}"
+ fi
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 41c70a7e0..000000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 56bb0164e..44f3cf2c1 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,2 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
\ No newline at end of file
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
diff --git a/.project b/.project
index d34865de3..f00ccfc41 100644
--- a/.project
+++ b/.project
@@ -16,12 +16,12 @@
- 1600224298170
+ 1665543654766
30
org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
+ node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..e138ec5d6
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,41 @@
+
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+ * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+ * Full paths of source file(s) related to the manifestation of the issue
+ * The location of the affected source code (tag/branch/commit or direct URL)
+ * Any special configuration required to reproduce the issue
+ * Step-by-step instructions to reproduce the issue
+ * Proof-of-concept or exploit code (if possible)
+ * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+
diff --git a/com.microsoft.java.debug.core/.classpath b/com.microsoft.java.debug.core/.classpath
index 9ba41a249..b6fe6b96c 100644
--- a/com.microsoft.java.debug.core/.classpath
+++ b/com.microsoft.java.debug.core/.classpath
@@ -13,7 +13,7 @@
-
+
diff --git a/com.microsoft.java.debug.core/.project b/com.microsoft.java.debug.core/.project
index a7480133e..353c44be5 100644
--- a/com.microsoft.java.debug.core/.project
+++ b/com.microsoft.java.debug.core/.project
@@ -28,12 +28,12 @@
- 1599036548523
+ 1665543654702
30
org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
+ node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
diff --git a/com.microsoft.java.debug.core/pom.xml b/com.microsoft.java.debug.core/pom.xml
index 83fed3cc9..8bfdb7292 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.40.0
+ 0.53.2
com.microsoft.java.debug.core
jar
@@ -42,7 +42,7 @@
org.apache.commons
commons-lang3
- 3.6
+ 3.18.0
com.google.code.gson
@@ -62,7 +62,7 @@
commons-io
commons-io
- 2.11.0
+ 2.14.0
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
index dfdbad4bb..d8316c2e3 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
@@ -42,24 +42,28 @@ public class Breakpoint implements IBreakpoint {
private String condition = null;
private String logMessage = null;
private HashMap propertyMap = new HashMap<>();
+ private final boolean suspendAllThreads;
private boolean async = false;
- Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber) {
- this(vm, eventHub, className, lineNumber, 0, null);
+ Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, boolean suspendAllThreads) {
+ this(vm, eventHub, className, lineNumber, 0, null, suspendAllThreads);
}
- Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount) {
- this(vm, eventHub, className, lineNumber, hitCount, null);
+ Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount, boolean suspendAllThreads) {
+ this(vm, eventHub, className, lineNumber, hitCount, null, suspendAllThreads);
}
- Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount, String condition) {
- this(vm, eventHub, className, lineNumber, hitCount, condition, null);
+ Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount,
+ String condition, boolean suspendAllThreads) {
+ this(vm, eventHub, className, lineNumber, hitCount, condition, null, suspendAllThreads);
}
- Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount, String condition, String logMessage) {
+ Breakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount,
+ String condition, String logMessage, boolean suspendAllThreads) {
this.vm = vm;
this.eventHub = eventHub;
+ this.suspendAllThreads = suspendAllThreads;
String contextClass = className;
String methodName = null;
String methodSignature = null;
@@ -79,13 +83,15 @@ public class Breakpoint implements IBreakpoint {
this.logMessage = logMessage;
}
- Breakpoint(VirtualMachine vm, IEventHub eventHub, JavaBreakpointLocation sourceLocation, int hitCount, String condition, String logMessage) {
+ Breakpoint(VirtualMachine vm, IEventHub eventHub, JavaBreakpointLocation sourceLocation, int hitCount,
+ String condition, String logMessage, boolean suspendAllThreads) {
this.vm = vm;
this.eventHub = eventHub;
this.sourceLocation = sourceLocation;
this.hitCount = hitCount;
this.condition = condition;
this.logMessage = logMessage;
+ this.suspendAllThreads = suspendAllThreads;
}
// IDebugResource
@@ -203,6 +209,19 @@ public void setAsync(boolean async) {
this.async = async;
}
+ @Override
+ public void setSuspendPolicy(String policy) {
+ }
+
+ @Override
+ public String getSuspendPolicy() {
+ return suspendAllThreads ? "SUSPEND_ALL" : "SUSPEND_EVENT_THREAD";
+ }
+
+ protected boolean suspendAllThreads() {
+ return suspendAllThreads;
+ }
+
@Override
public CompletableFuture install() {
// It's possible that different class loaders create new class with the same name.
@@ -325,7 +344,8 @@ private Location findMethodLocaiton(ReferenceType refType, String methodName, St
for (Method method : methods) {
if (!method.isAbstract() && !method.isNative()
&& methodName.equals(method.name())
- && (methodSiguature.equals(method.genericSignature()) || methodSiguature.equals(method.signature()))) {
+ && (methodSiguature.equals(method.genericSignature()) || methodSiguature.equals(method.signature())
+ || toNoneGeneric(methodSiguature).equals(method.signature()))) {
location = method.location();
break;
}
@@ -334,6 +354,28 @@ private Location findMethodLocaiton(ReferenceType refType, String methodName, St
return location;
}
+ static String toNoneGeneric(String genericSig) {
+ StringBuilder builder = new StringBuilder();
+ boolean append = true;
+ int depth = 0;
+ char[] chars = genericSig.toCharArray();
+ for (int i = 0; i < chars.length; i++) {
+ char c = chars[i];
+ if (c == '<') {
+ depth++;
+ append = (depth == 0);
+ }
+ if (append) {
+ builder.append(c);
+ }
+ if (c == '>') {
+ depth--;
+ append = (depth == 0);
+ }
+ }
+ return builder.toString();
+ }
+
private List findLocaitonsOfLine(Method method, int lineNumber) {
try {
return method.locationsOfLine(lineNumber);
@@ -389,7 +431,11 @@ private CompletableFuture> createBreakpointRequests(List
newLocations.forEach(location -> {
BreakpointRequest request = vm.eventRequestManager().createBreakpointRequest(location);
- request.setSuspendPolicy(BreakpointRequest.SUSPEND_EVENT_THREAD);
+ if ("SUSPEND_ALL".equals(getSuspendPolicy())) {
+ request.setSuspendPolicy(BreakpointRequest.SUSPEND_ALL);
+ } else {
+ request.setSuspendPolicy(BreakpointRequest.SUSPEND_EVENT_THREAD);
+ }
if (hitCount > 0) {
request.addCountFilter(hitCount);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
index 1c7990f16..d5b8ceb47 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
@@ -16,19 +16,32 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+
import com.sun.jdi.ObjectCollectedException;
+import com.sun.jdi.ReferenceType;
import com.sun.jdi.ThreadReference;
+import com.sun.jdi.VMDisconnectedException;
import com.sun.jdi.VirtualMachine;
+import com.sun.jdi.event.ClassPrepareEvent;
+import com.sun.jdi.request.ClassPrepareRequest;
import com.sun.jdi.request.EventRequest;
import com.sun.jdi.request.EventRequestManager;
import com.sun.jdi.request.ExceptionRequest;
+import io.reactivex.disposables.Disposable;
+
public class DebugSession implements IDebugSession {
private VirtualMachine vm;
private EventHub eventHub = new EventHub();
+ private List eventRequests = new ArrayList<>();
+ private List subscriptions = new ArrayList<>();
+ private final boolean suspendAllThreads;
public DebugSession(VirtualMachine virtualMachine) {
vm = virtualMachine;
+ // Capture suspend policy at session start - this persists for the session lifetime
+ this.suspendAllThreads = DebugSettings.getCurrent().suspendAllThreads;
}
@Override
@@ -109,24 +122,26 @@ public void detach() {
@Override
public void terminate() {
- if (vm.process() == null || vm.process().isAlive()) {
+ if (vm.process() != null && vm.process().isAlive()) {
+ vm.process().destroy();
+ } else if (vm.process() == null || vm.process().isAlive()) {
vm.exit(0);
}
}
@Override
public IBreakpoint createBreakpoint(JavaBreakpointLocation sourceLocation, int hitCount, String condition, String logMessage) {
- return new EvaluatableBreakpoint(vm, this.getEventHub(), sourceLocation, hitCount, condition, logMessage);
+ return new EvaluatableBreakpoint(vm, this.getEventHub(), sourceLocation, hitCount, condition, logMessage, suspendAllThreads);
}
@Override
public IBreakpoint createBreakpoint(String className, int lineNumber, int hitCount, String condition, String logMessage) {
- return new EvaluatableBreakpoint(vm, this.getEventHub(), className, lineNumber, hitCount, condition, logMessage);
+ return new EvaluatableBreakpoint(vm, this.getEventHub(), className, lineNumber, hitCount, condition, logMessage, suspendAllThreads);
}
@Override
public IWatchpoint createWatchPoint(String className, String fieldName, String accessType, String condition, int hitCount) {
- return new Watchpoint(vm, this.getEventHub(), className, fieldName, accessType, condition, hitCount);
+ return new Watchpoint(vm, this.getEventHub(), className, fieldName, accessType, condition, hitCount, suspendAllThreads);
}
@Override
@@ -136,9 +151,27 @@ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught
@Override
public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] classFilters, String[] classExclusionFilters) {
+ setExceptionBreakpoints(notifyCaught, notifyUncaught, null, classFilters, classExclusionFilters);
+ }
+
+ @Override
+ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes,
+ String[] classFilters, String[] classExclusionFilters) {
EventRequestManager manager = vm.eventRequestManager();
- ArrayList legacy = new ArrayList<>(manager.exceptionRequests());
- manager.deleteEventRequests(legacy);
+
+ try {
+ ArrayList legacy = new ArrayList<>(manager.exceptionRequests());
+ manager.deleteEventRequests(legacy);
+ manager.deleteEventRequests(eventRequests);
+ } catch (VMDisconnectedException ex) {
+ // ignore since removing breakpoints is meaningless when JVM is terminated.
+ }
+ subscriptions.forEach(subscription -> {
+ subscription.dispose();
+ });
+ subscriptions.clear();
+ eventRequests.clear();
+
// When no exception breakpoints are requested, no need to create an empty exception request.
if (notifyCaught || notifyUncaught) {
// from: https://www.javatips.net/api/REPLmode-master/src/jm/mode/replmode/REPLRunner.java
@@ -153,20 +186,60 @@ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught
// a thread to be available, and queries it by calling allThreads().
// See org.eclipse.debug.jdi.tests.AbstractJDITest for the example.
- // get only the uncaught exceptions
- ExceptionRequest request = manager.createExceptionRequest(null, notifyCaught, notifyUncaught);
- request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
- if (classFilters != null) {
- for (String classFilter : classFilters) {
- request.addClassFilter(classFilter);
+ if (exceptionTypes == null || exceptionTypes.length == 0) {
+ ExceptionRequest request = manager.createExceptionRequest(null, notifyCaught, notifyUncaught);
+ request.setSuspendPolicy(suspendAllThreads ? EventRequest.SUSPEND_ALL : EventRequest.SUSPEND_EVENT_THREAD);
+ if (classFilters != null) {
+ for (String classFilter : classFilters) {
+ request.addClassFilter(classFilter);
+ }
+ }
+ if (classExclusionFilters != null) {
+ for (String exclusionFilter : classExclusionFilters) {
+ request.addClassExclusionFilter(exclusionFilter);
+ }
}
+ request.enable();
+ return;
}
- if (classExclusionFilters != null) {
- for (String exclusionFilter : classExclusionFilters) {
- request.addClassExclusionFilter(exclusionFilter);
+
+ for (String exceptionType : exceptionTypes) {
+ if (StringUtils.isBlank(exceptionType)) {
+ continue;
+ }
+
+ // register exception breakpoint in the future loaded classes.
+ ClassPrepareRequest classPrepareRequest = manager.createClassPrepareRequest();
+ classPrepareRequest.addClassFilter(exceptionType);
+ classPrepareRequest.enable();
+ eventRequests.add(classPrepareRequest);
+
+ Disposable subscription = eventHub.events()
+ .filter(debugEvent -> debugEvent.event instanceof ClassPrepareEvent
+ && eventRequests.contains(debugEvent.event.request()))
+ .subscribe(debugEvent -> {
+ ClassPrepareEvent event = (ClassPrepareEvent) debugEvent.event;
+ createExceptionBreakpoint(event.referenceType(), notifyCaught, notifyUncaught, classFilters, classExclusionFilters);
+ });
+ subscriptions.add(subscription);
+
+ // register exception breakpoint in the loaded classes.
+ for (ReferenceType refType : vm.classesByName(exceptionType)) {
+ createExceptionBreakpoint(refType, notifyCaught, notifyUncaught, classFilters, classExclusionFilters);
}
}
- request.enable();
+ }
+ }
+
+ @Override
+ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes,
+ String[] classFilters, String[] classExclusionFilters, boolean async) {
+ if (async) {
+ AsyncJdwpUtils.runAsync(() -> {
+ setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters);
+ });
+ } else {
+ setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters);
}
}
@@ -190,9 +263,32 @@ public VirtualMachine getVM() {
return vm;
}
+ @Override
+ public boolean shouldSuspendAllThreads() {
+ return suspendAllThreads;
+ }
+
@Override
public IMethodBreakpoint createFunctionBreakpoint(String className, String functionName, String condition,
int hitCount) {
- return new MethodBreakpoint(vm, this.getEventHub(), className, functionName, condition, hitCount);
+ return new MethodBreakpoint(vm, this.getEventHub(), className, functionName, condition, hitCount, suspendAllThreads);
+ }
+
+ private void createExceptionBreakpoint(ReferenceType refType, boolean notifyCaught, boolean notifyUncaught,
+ String[] classFilters, String[] classExclusionFilters) {
+ EventRequestManager manager = vm.eventRequestManager();
+ ExceptionRequest request = manager.createExceptionRequest(refType, notifyCaught, notifyUncaught);
+ request.setSuspendPolicy(suspendAllThreads ? EventRequest.SUSPEND_ALL : EventRequest.SUSPEND_EVENT_THREAD);
+ if (classFilters != null) {
+ for (String classFilter : classFilters) {
+ request.addClassFilter(classFilter);
+ }
+ }
+ if (classExclusionFilters != null) {
+ for (String exclusionFilter : classExclusionFilters) {
+ request.addClassExclusionFilter(exclusionFilter);
+ }
+ }
+ request.enable();
}
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSettings.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSettings.java
index f59f10043..b422f6801 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSettings.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSettings.java
@@ -19,7 +19,7 @@
import com.google.gson.JsonSyntaxException;
import com.google.gson.annotations.SerializedName;
import com.microsoft.java.debug.core.protocol.JsonUtils;
-import com.microsoft.java.debug.core.protocol.Requests.ClassFilters;
+import com.microsoft.java.debug.core.protocol.Requests.ExceptionFilters;
import com.microsoft.java.debug.core.protocol.Requests.StepFilters;
public final class DebugSettings {
@@ -39,11 +39,13 @@ public final class DebugSettings {
public String javaHome;
public HotCodeReplace hotCodeReplace = HotCodeReplace.MANUAL;
public StepFilters stepFilters = new StepFilters();
- public ClassFilters exceptionFilters = new ClassFilters();
+ public ExceptionFilters exceptionFilters = new ExceptionFilters();
public boolean exceptionFiltersUpdated = false;
public int limitOfVariablesPerJdwpRequest = 100;
public int jdwpRequestTimeout = 3000;
public AsyncMode asyncJDWP = AsyncMode.OFF;
+ public Switch debugSupportOnDecompiledSource = Switch.OFF;
+ public boolean suspendAllThreads = false;
public static DebugSettings getCurrent() {
return current;
@@ -97,6 +99,13 @@ public static enum AsyncMode {
OFF
}
+ public static enum Switch {
+ @SerializedName("on")
+ ON,
+ @SerializedName("off")
+ OFF
+ }
+
public static interface IDebugSettingChangeListener {
public void update(DebugSettings oldSettings, DebugSettings newSettings);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugUtility.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugUtility.java
index 4a2a49e9b..8a31792f0 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugUtility.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugUtility.java
@@ -394,6 +394,7 @@ private static StepRequest createStepRequest(ThreadReference thread, int stepSiz
request.addClassExclusionFilter(exclusionFilter);
}
}
+ // Note: suspend policy will be set by the caller (StepRequestHandler) based on session settings
request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
request.addCountFilter(1);
@@ -415,7 +416,7 @@ public static CompletableFuture stopOnEntry(IDebugSession debugSession, St
EventRequestManager manager = debugSession.getVM().eventRequestManager();
MethodEntryRequest request = manager.createMethodEntryRequest();
request.addClassFilter(mainClass);
- request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
+ request.setSuspendPolicy(debugSession.shouldSuspendAllThreads() ? EventRequest.SUSPEND_ALL : EventRequest.SUSPEND_EVENT_THREAD);
debugSession.getEventHub().events().filter(debugEvent -> {
return debugEvent.event instanceof MethodEntryEvent && request.equals(debugEvent.event.request());
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java
index 723e2cadf..d5a909f0b 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/EvaluatableBreakpoint.java
@@ -29,28 +29,28 @@ public class EvaluatableBreakpoint extends Breakpoint implements IEvaluatableBre
private Object compiledLogpointExpression = null;
private Map compiledExpressions = new ConcurrentHashMap<>();
- EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber) {
- this(vm, eventHub, className, lineNumber, 0, null);
+ EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, boolean suspendAllThreads) {
+ this(vm, eventHub, className, lineNumber, 0, null, suspendAllThreads);
}
- EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount) {
- this(vm, eventHub, className, lineNumber, hitCount, null);
+ EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount, boolean suspendAllThreads) {
+ this(vm, eventHub, className, lineNumber, hitCount, null, suspendAllThreads);
}
EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount,
- String condition) {
- this(vm, eventHub, className, lineNumber, hitCount, condition, null);
+ String condition, boolean suspendAllThreads) {
+ this(vm, eventHub, className, lineNumber, hitCount, condition, null, suspendAllThreads);
}
EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, int lineNumber, int hitCount,
- String condition, String logMessage) {
- super(vm, eventHub, className, lineNumber, hitCount, condition, logMessage);
+ String condition, String logMessage, boolean suspendAllThreads) {
+ super(vm, eventHub, className, lineNumber, hitCount, condition, logMessage, suspendAllThreads);
this.eventHub = eventHub;
}
EvaluatableBreakpoint(VirtualMachine vm, IEventHub eventHub, JavaBreakpointLocation sourceLocation, int hitCount,
- String condition, String logMessage) {
- super(vm, eventHub, sourceLocation, hitCount, condition, logMessage);
+ String condition, String logMessage, boolean suspendAllThreads) {
+ super(vm, eventHub, sourceLocation, hitCount, condition, logMessage, suspendAllThreads);
this.eventHub = eventHub;
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IBreakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IBreakpoint.java
index 40995e9dd..ec3ea818a 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IBreakpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IBreakpoint.java
@@ -55,4 +55,11 @@ default void setAsync(boolean async) {
default boolean async() {
return false;
}
+
+ default void setSuspendPolicy(String policy) {
+ }
+
+ default String getSuspendPolicy() {
+ return null;
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java
index 4e4078c87..afc2283f0 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java
@@ -38,6 +38,11 @@ public interface IDebugSession {
void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] classFilters, String[] classExclusionFilters);
+ void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes, String[] classFilters, String[] classExclusionFilters);
+
+ void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes, String[] classFilters, String[] classExclusionFilters,
+ boolean async);
+
IMethodBreakpoint createFunctionBreakpoint(String className, String functionName, String condition, int hitCount);
Process process();
@@ -47,4 +52,10 @@ public interface IDebugSession {
IEventHub getEventHub();
VirtualMachine getVM();
+
+ /**
+ * Returns whether breakpoints should suspend all threads or just the event thread.
+ * This value is captured at session start and persists for the session lifetime.
+ */
+ boolean shouldSuspendAllThreads();
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/JavaBreakpointLocation.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/JavaBreakpointLocation.java
index 820e80c9b..3dbc1a24d 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/JavaBreakpointLocation.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/JavaBreakpointLocation.java
@@ -17,7 +17,11 @@
public class JavaBreakpointLocation {
/**
- * The source line of the breakpoint or logpoint.
+ * The line number in the source file.
+ */
+ private int lineNumberInSourceFile = Integer.MIN_VALUE;
+ /**
+ * The line number in the class file.
*/
private int lineNumber;
/**
@@ -110,4 +114,12 @@ public Types.BreakpointLocation[] availableBreakpointLocations() {
public void setAvailableBreakpointLocations(Types.BreakpointLocation[] availableBreakpointLocations) {
this.availableBreakpointLocations = availableBreakpointLocations;
}
+
+ public int lineNumberInSourceFile() {
+ return lineNumberInSourceFile == Integer.MIN_VALUE ? lineNumber : lineNumberInSourceFile;
+ }
+
+ public void setLineNumberInSourceFile(int lineNumberInSourceFile) {
+ this.lineNumberInSourceFile = lineNumberInSourceFile;
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/MethodBreakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/MethodBreakpoint.java
index 7a6e74c6b..bc46fd96f 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/MethodBreakpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/MethodBreakpoint.java
@@ -44,6 +44,7 @@ public class MethodBreakpoint implements IMethodBreakpoint, IEvaluatableBreakpoi
private String condition;
private int hitCount;
private boolean async = false;
+ private final boolean suspendAllThreads;
private HashMap propertyMap = new HashMap<>();
private Object compiledConditionalExpression = null;
@@ -53,7 +54,7 @@ public class MethodBreakpoint implements IMethodBreakpoint, IEvaluatableBreakpoi
private List subscriptions = new ArrayList<>();
public MethodBreakpoint(VirtualMachine vm, IEventHub eventHub, String className, String functionName,
- String condition, int hitCount) {
+ String condition, int hitCount, boolean suspendAllThreads) {
Objects.requireNonNull(vm);
Objects.requireNonNull(eventHub);
Objects.requireNonNull(className);
@@ -64,6 +65,7 @@ public MethodBreakpoint(VirtualMachine vm, IEventHub eventHub, String className,
this.functionName = functionName;
this.condition = condition;
this.hitCount = hitCount;
+ this.suspendAllThreads = suspendAllThreads;
}
@Override
@@ -262,7 +264,7 @@ private Optional createMethodEntryRequest0(ReferenceType typ
MethodEntryRequest request = vm.eventRequestManager().createMethodEntryRequest();
request.addClassFilter(type);
- request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
+ request.setSuspendPolicy(suspendAllThreads ? EventRequest.SUSPEND_ALL : EventRequest.SUSPEND_EVENT_THREAD);
if (hitCount > 0) {
request.addCountFilter(hitCount);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Watchpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Watchpoint.java
index 3de321ec8..fdb2354a9 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Watchpoint.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Watchpoint.java
@@ -46,20 +46,22 @@ public class Watchpoint implements IWatchpoint, IEvaluatableBreakpoint {
private HashMap propertyMap = new HashMap<>();
private Object compiledConditionalExpression = null;
private Map compiledExpressions = new ConcurrentHashMap<>();
+ private final boolean suspendAllThreads;
// IDebugResource
private List requests = new ArrayList<>();
private List subscriptions = new ArrayList<>();
- Watchpoint(VirtualMachine vm, IEventHub eventHub, String className, String fieldName) {
- this(vm, eventHub, className, fieldName, "write");
+ Watchpoint(VirtualMachine vm, IEventHub eventHub, String className, String fieldName, boolean suspendAllThreads) {
+ this(vm, eventHub, className, fieldName, "write", suspendAllThreads);
}
- Watchpoint(VirtualMachine vm, IEventHub eventHub, String className, String fieldName, String accessType) {
- this(vm, eventHub, className, fieldName, accessType, null, 0);
+ Watchpoint(VirtualMachine vm, IEventHub eventHub, String className, String fieldName, String accessType, boolean suspendAllThreads) {
+ this(vm, eventHub, className, fieldName, accessType, null, 0, suspendAllThreads);
}
- Watchpoint(VirtualMachine vm, IEventHub eventHub, String className, String fieldName, String accessType, String condition, int hitCount) {
+ Watchpoint(VirtualMachine vm, IEventHub eventHub, String className, String fieldName, String accessType,
+ String condition, int hitCount, boolean suspendAllThreads) {
Objects.requireNonNull(vm);
Objects.requireNonNull(eventHub);
Objects.requireNonNull(className);
@@ -71,6 +73,7 @@ public class Watchpoint implements IWatchpoint, IEvaluatableBreakpoint {
this.accessType = accessType;
this.condition = condition;
this.hitCount = hitCount;
+ this.suspendAllThreads = suspendAllThreads;
}
@Override
@@ -212,7 +215,7 @@ private List createWatchpointRequests(ReferenceType type) {
}
watchpointRequests.forEach(request -> {
- request.setSuspendPolicy(WatchpointRequest.SUSPEND_EVENT_THREAD);
+ request.setSuspendPolicy(suspendAllThreads ? EventRequest.SUSPEND_ALL : EventRequest.SUSPEND_EVENT_THREAD);
if (hitCount > 0) {
request.addCountFilter(hitCount);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/AdapterUtils.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/AdapterUtils.java
index 9b972334d..c30aa8742 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/AdapterUtils.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/AdapterUtils.java
@@ -310,4 +310,58 @@ public static String decodeURIComponent(String uri) {
return uri;
}
}
+
+ /**
+ * Find the mapped lines based on the given line number.
+ *
+ * The line mappings format is as follows:
+ * - [i]: key
+ * - [i+1]: value
+ */
+ public static int[] binarySearchMappedLines(int[] lineMappings, int targetLine) {
+ if (lineMappings == null || lineMappings.length == 0 || lineMappings.length % 2 != 0) {
+ return null;
+ }
+
+ final int MAX = lineMappings.length / 2 - 1;
+ int low = 0;
+ int high = MAX;
+ int found = -1;
+ while (low <= high) {
+ int mid = low + (high - low) / 2;
+ int actualMid = mid * 2;
+ if (lineMappings[actualMid] == targetLine) {
+ found = mid;
+ break;
+ }
+
+ if (lineMappings[actualMid] < targetLine) {
+ low = mid + 1;
+ } else {
+ high = mid - 1;
+ }
+ }
+
+ if (found == -1) {
+ return null;
+ }
+
+ // Find the duplicates in the sorted array
+ int left = found;
+ while ((left - 1) >= 0 && lineMappings[(left - 1) * 2] == targetLine) {
+ left--;
+ }
+
+ int right = found;
+ while ((right + 1) <= MAX && lineMappings[(right + 1) * 2] == targetLine) {
+ right++;
+ }
+
+ int[] values = new int[right - left + 1];
+ for (int i = 0; i < values.length; i++) {
+ values[i] = lineMappings[(left + i) * 2 + 1];
+ }
+
+ return values;
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java
index edc771163..8f595151f 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java
@@ -34,6 +34,7 @@
import com.microsoft.java.debug.core.adapter.handler.InlineValuesRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.LaunchRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.ProcessIdHandler;
+import com.microsoft.java.debug.core.adapter.handler.RefreshFramesHandler;
import com.microsoft.java.debug.core.adapter.handler.RefreshVariablesHandler;
import com.microsoft.java.debug.core.adapter.handler.RestartFrameHandler;
import com.microsoft.java.debug.core.adapter.handler.ScopesRequestHandler;
@@ -44,6 +45,7 @@
import com.microsoft.java.debug.core.adapter.handler.SetVariableRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.SourceRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.StackTraceRequestHandler;
+import com.microsoft.java.debug.core.adapter.handler.StepInTargetsRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.StepRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.ThreadsRequestHandler;
import com.microsoft.java.debug.core.adapter.handler.VariablesRequestHandler;
@@ -100,7 +102,7 @@ public CompletableFuture dispatchRequest(Messages.Request req
}
}
- private void initialize() {
+ protected void initialize() {
// Register request handlers.
// When there are multiple handlers registered for the same request, follow the rule "first register, first execute".
registerHandler(new InitializeRequestHandler());
@@ -131,20 +133,23 @@ private void initialize() {
registerHandlerForDebug(new ProcessIdHandler());
registerHandlerForDebug(new SetFunctionBreakpointsRequestHandler());
registerHandlerForDebug(new BreakpointLocationsRequestHander());
+ registerHandlerForDebug(new StepInTargetsRequestHandler());
+ registerHandlerForDebug(new RefreshFramesHandler());
+
// NO_DEBUG mode only
registerHandlerForNoDebug(new DisconnectRequestWithoutDebuggingHandler());
registerHandlerForNoDebug(new ProcessIdHandler());
}
- private void registerHandlerForDebug(IDebugRequestHandler handler) {
+ protected void registerHandlerForDebug(IDebugRequestHandler handler) {
registerHandler(requestHandlersForDebug, handler);
}
- private void registerHandlerForNoDebug(IDebugRequestHandler handler) {
+ protected void registerHandlerForNoDebug(IDebugRequestHandler handler) {
registerHandler(requestHandlersForNoDebug, handler);
}
- private void registerHandler(IDebugRequestHandler handler) {
+ protected void registerHandler(IDebugRequestHandler handler) {
registerHandler(requestHandlersForDebug, handler);
registerHandler(requestHandlersForNoDebug, handler);
}
@@ -160,4 +165,5 @@ private void registerHandler(Map> requestHan
handlerList.add(handler);
}
}
+
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapterContext.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapterContext.java
index 345b2fcdf..bbf215c67 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapterContext.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapterContext.java
@@ -32,7 +32,7 @@
public class DebugAdapterContext implements IDebugAdapterContext {
private static final int MAX_CACHE_ITEMS = 10000;
private final StepFilters defaultFilters = new StepFilters();
- private Map sourceMappingCache = Collections.synchronizedMap(new LRUCache<>(MAX_CACHE_ITEMS));
+ private Map sourceMappingCache = Collections.synchronizedMap(new LRUCache<>(MAX_CACHE_ITEMS));
private IProviderContext providerContext;
private IProtocolServer server;
@@ -56,6 +56,7 @@ public class DebugAdapterContext implements IDebugAdapterContext {
private StepFilters stepFilters;
private Path classpathJar = null;
private Path argsfile = null;
+ private boolean isInitialized = false;
private long shellProcessId = -1;
private long processId = -1;
@@ -211,7 +212,7 @@ public void setVariableFormatter(IVariableFormatter variableFormatter) {
}
@Override
- public Map getSourceLookupCache() {
+ public Map getSourceLookupCache() {
return sourceMappingCache;
}
@@ -407,4 +408,14 @@ public long getJDWPLatency() {
public void setJDWPLatency(long baseLatency) {
this.jdwpLatency = baseLatency;
}
+
+ @Override
+ public boolean isInitialized() {
+ return isInitialized;
+ }
+
+ @Override
+ public void setInitialized(boolean isInitialized) {
+ this.isInitialized = isInitialized;
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java
index 1cdc4f9ce..6cfe523cf 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2017 Microsoft Corporation and others.
+* Copyright (c) 2017-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,7 +35,8 @@ public enum ErrorCode {
EXCEPTION_INFO_FAILURE(1018),
EVALUATION_COMPILE_ERROR(2001),
EVALUATE_NOT_SUSPENDED_THREAD(2002),
- HCR_FAILURE(3001);
+ HCR_FAILURE(3001),
+ INVALID_DAP_HEADER(3002);
private int id;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterContext.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterContext.java
index 9df539e1d..e65270eef 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterContext.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterContext.java
@@ -85,7 +85,7 @@ public interface IDebugAdapterContext {
void setVariableFormatter(IVariableFormatter variableFormatter);
- Map getSourceLookupCache();
+ Map getSourceLookupCache();
void setDebuggeeEncoding(Charset encoding);
@@ -154,4 +154,8 @@ public interface IDebugAdapterContext {
long getJDWPLatency();
void setJDWPLatency(long baseLatency);
+
+ boolean isInitialized();
+
+ void setInitialized(boolean isInitialized);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterFactory.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterFactory.java
new file mode 100644
index 000000000..d392d3b48
--- /dev/null
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IDebugAdapterFactory.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Microsoft Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Microsoft Corporation - initial API and implementation
+*******************************************************************************/
+
+package com.microsoft.java.debug.core.adapter;
+
+import com.microsoft.java.debug.core.protocol.IProtocolServer;
+
+@FunctionalInterface
+public interface IDebugAdapterFactory {
+ public IDebugAdapter create(IProtocolServer server);
+}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ISourceLookUpProvider.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ISourceLookUpProvider.java
index 9976fc16f..f33742852 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ISourceLookUpProvider.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ISourceLookUpProvider.java
@@ -8,9 +8,11 @@
* Contributors:
* Microsoft Corporation - initial API and implementation
*******************************************************************************/
-
package com.microsoft.java.debug.core.adapter;
+import java.util.List;
+import java.util.Objects;
+
import com.microsoft.java.debug.core.DebugException;
import com.microsoft.java.debug.core.JavaBreakpointLocation;
import com.microsoft.java.debug.core.protocol.Types.SourceBreakpoint;
@@ -39,18 +41,31 @@ public interface ISourceLookUpProvider extends IProvider {
JavaBreakpointLocation[] getBreakpointLocations(String sourceUri, SourceBreakpoint[] sourceBreakpoints) throws DebugException;
/**
- * Given a fully qualified class name and source file path, search the associated disk source file.
- *
- * @param fullyQualifiedName
- * the fully qualified class name (e.g. com.microsoft.java.debug.core.adapter.ISourceLookUpProvider).
- * @param sourcePath
- * the qualified source file path (e.g. com\microsoft\java\debug\core\adapter\ISourceLookupProvider.java).
- * @return the associated source file uri.
+ * Deprecated, please use {@link #getSource(String, String)} instead.
*/
+ @Deprecated
String getSourceFileURI(String fullyQualifiedName, String sourcePath);
String getSourceContents(String uri);
+ /**
+ * Retrieves a {@link Source} object representing the source code associated with the given fully qualified class name and source file path.
+ * The implementation of this interface can determine a source is "local" or "remote".
+ * In case of "remote" a follow up "source" request will be issued by the client
+ *
+ * @param fullyQualifiedName
+ * the fully qualified class name,
+ * e.g., "com.microsoft.java.debug.core.adapter.ISourceLookUpProvider".
+ * @param sourcePath
+ * the qualified source file path,
+ * e.g., "com/microsoft/java/debug/core/adapter/ISourceLookupProvider.java".
+ * @return A {@link Source} object encapsulating the source file URI obtained from
+ * {@link #getSourceFileURI(String, String)} and the source type as {@link SourceType#LOCAL}.
+ */
+ default Source getSource(String fullyQualifiedName, String sourcePath) {
+ return new Source(getSourceFileURI(fullyQualifiedName, sourcePath), SourceType.LOCAL);
+ }
+
/**
* Returns the Java runtime that the specified project's build path used.
* @param projectName
@@ -60,4 +75,70 @@ public interface ISourceLookUpProvider extends IProvider {
default String getJavaRuntimeVersion(String projectName) {
return null;
}
+
+ /**
+ * Return method invocation found in the statement as the given line number of
+ * the source file.
+ *
+ * @param uri The source file where the invocation must be searched.
+ * @param line The line number where the invocation must be searched.
+ *
+ * @return List of found method invocation or empty if not method invocations
+ * can be found.
+ */
+ List findMethodInvocations(String uri, int line);
+
+ /**
+ * Return the line mappings from the original line to the decompiled line.
+ *
+ * @param uri The uri
+ * @return the line mappings from the original line to the decompiled line.
+ */
+ default int[] getOriginalLineMappings(String uri) {
+ return null;
+ }
+
+ /**
+ * Return the line mappings from the decompiled line to the original line.
+ *
+ * @param uri The uri
+ * @return the line mappings from the decompiled line to the original line.
+ */
+ default int[] getDecompiledLineMappings(String uri) {
+ return null;
+ }
+
+ public static class MethodInvocation {
+ public String expression;
+ public String methodName;
+ public String methodSignature;
+ public String methodGenericSignature;
+ public String declaringTypeName;
+ public int lineStart;
+ public int lineEnd;
+ public int columnStart;
+ public int columnEnd;
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(expression, methodName, methodSignature, methodGenericSignature, declaringTypeName,
+ lineStart, lineEnd, columnStart, columnEnd);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof MethodInvocation)) {
+ return false;
+ }
+ MethodInvocation other = (MethodInvocation) obj;
+ return Objects.equals(expression, other.expression) && Objects.equals(methodName, other.methodName)
+ && Objects.equals(methodSignature, other.methodSignature)
+ && Objects.equals(methodGenericSignature, other.methodGenericSignature)
+ && Objects.equals(declaringTypeName, other.declaringTypeName) && lineStart == other.lineStart
+ && lineEnd == other.lineEnd && columnStart == other.columnStart && columnEnd == other.columnEnd;
+ }
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStackFrameManager.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStackFrameManager.java
index abce2ff3e..8d6c74486 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStackFrameManager.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStackFrameManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Microsoft Corporation and others.
+ * Copyright (c) 2017-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,15 @@ public interface IStackFrameManager {
*/
StackFrame[] reloadStackFrames(ThreadReference thread);
+ /**
+ * Refresh all stackframes from jdi thread.
+ *
+ * @param thread the jdi thread
+ * @param force Whether to load the whole frames if the thread's stackframes haven't been cached.
+ * @return all the stackframes in the specified thread
+ */
+ StackFrame[] reloadStackFrames(ThreadReference thread, boolean force);
+
/**
* Refersh the stackframes starting from the specified depth and length.
*
@@ -48,4 +57,9 @@ public interface IStackFrameManager {
* @param thread the jdi thread
*/
void clearStackFrames(ThreadReference thread);
+
+ /**
+ * Clear the whole stackframes cache.
+ */
+ void clearStackFrames();
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java
index 0526293b9..9e503e0af 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java
@@ -52,6 +52,20 @@ public ProtocolServer(InputStream input, OutputStream output, IProviderContext c
debugAdapter = new DebugAdapter(this, context);
}
+ /**
+ * Constructs a protocol server instance based on the given input stream and output stream.
+ * @param input
+ * the input stream
+ * @param output
+ * the output stream
+ * @param debugAdapterFactory
+ * factory to create debug adapter that implements DAP communication
+ */
+ public ProtocolServer(InputStream input, OutputStream output, IDebugAdapterFactory debugAdapterFactory) {
+ super(input, output);
+ debugAdapter = debugAdapterFactory.create(this);
+ }
+
/**
* A while-loop to parse input data and send output data constantly.
*/
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/Source.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/Source.java
new file mode 100644
index 000000000..d00b4cb4c
--- /dev/null
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/Source.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Microsoft Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Microsoft Corporation - initial API and implementation
+ *******************************************************************************/
+
+package com.microsoft.java.debug.core.adapter;
+
+public class Source {
+ public final String uri;
+ public final SourceType type;
+
+ public Source(String uri, SourceType type) {
+ this.uri = uri;
+ this.type = type;
+ }
+
+ public String getUri() {
+ return this.uri;
+ }
+
+ public SourceType getType() {
+ return this.type;
+ }
+}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/SourceType.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/SourceType.java
new file mode 100644
index 000000000..724bf3bda
--- /dev/null
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/SourceType.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Microsoft Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Microsoft Corporation - initial API and implementation
+ *******************************************************************************/
+package com.microsoft.java.debug.core.adapter;
+
+public enum SourceType {
+ REMOTE,
+ LOCAL
+}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/StackFrameManager.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/StackFrameManager.java
index 2a9d1e47e..518cc7761 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/StackFrameManager.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/StackFrameManager.java
@@ -32,10 +32,19 @@ public synchronized StackFrame getStackFrame(StackFrameReference ref) {
@Override
public synchronized StackFrame[] reloadStackFrames(ThreadReference thread) {
+ return reloadStackFrames(thread, true);
+ }
+
+ @Override
+ public synchronized StackFrame[] reloadStackFrames(ThreadReference thread, boolean force) {
return threadStackFrameMap.compute(thread.uniqueID(), (key, old) -> {
try {
if (old == null || old.length == 0) {
- return thread.frames().toArray(new StackFrame[0]);
+ if (force) {
+ return thread.frames().toArray(new StackFrame[0]);
+ } else {
+ return new StackFrame[0];
+ }
} else {
return thread.frames(0, old.length).toArray(new StackFrame[0]);
}
@@ -71,4 +80,9 @@ public synchronized StackFrame[] reloadStackFrames(ThreadReference thread, int s
public synchronized void clearStackFrames(ThreadReference thread) {
threadStackFrameMap.remove(thread.uniqueID());
}
+
+ @Override
+ public synchronized void clearStackFrames() {
+ threadStackFrameMap.clear();
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ThreadCache.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ThreadCache.java
index ce1c17282..57d39154e 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ThreadCache.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ThreadCache.java
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -32,6 +33,8 @@ protected boolean removeEldestEntry(java.util.Map.Entry eldest) {
}
});
private Map eventThreads = new ConcurrentHashMap<>();
+ private Map> decompiledClassesByThread = new HashMap<>();
+ private Map threadStoppedReasons = new HashMap<>();
public synchronized void resetThreads(List threads) {
allThreads.clear();
@@ -80,6 +83,13 @@ public void addEventThread(ThreadReference thread) {
eventThreads.put(thread.uniqueID(), thread);
}
+ public void addEventThread(ThreadReference thread, String reason) {
+ eventThreads.put(thread.uniqueID(), thread);
+ if (reason != null) {
+ threadStoppedReasons.put(thread.uniqueID(), reason);
+ }
+ }
+
public void removeEventThread(long threadId) {
eventThreads.remove(threadId);
}
@@ -113,4 +123,40 @@ public List visibleThreads(IDebugAdapterContext context) {
return visibleThreads;
}
+
+ public Set getDecompiledClassesByThread(long threadId) {
+ return decompiledClassesByThread.get(threadId);
+ }
+
+ public void setDecompiledClassesByThread(long threadId, Set decompiledClasses) {
+ if (decompiledClasses == null || decompiledClasses.isEmpty()) {
+ decompiledClassesByThread.remove(threadId);
+ return;
+ }
+
+ decompiledClassesByThread.put(threadId, decompiledClasses);
+ }
+
+ public String getThreadStoppedReason(long threadId) {
+ return threadStoppedReasons.get(threadId);
+ }
+
+ public void setThreadStoppedReason(long threadId, String reason) {
+ if (reason == null) {
+ threadStoppedReasons.remove(threadId);
+ return;
+ }
+
+ threadStoppedReasons.put(threadId, reason);
+ }
+
+ public void clearThreadStoppedState(long threadId) {
+ threadStoppedReasons.remove(threadId);
+ decompiledClassesByThread.remove(threadId);
+ }
+
+ public void clearAllThreadStoppedState() {
+ threadStoppedReasons.clear();
+ decompiledClassesByThread.clear();
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java
index 6805073dc..308adddb6 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java
@@ -40,6 +40,7 @@
import com.sun.jdi.event.ThreadStartEvent;
import com.sun.jdi.event.VMDeathEvent;
import com.sun.jdi.event.VMDisconnectEvent;
+import com.sun.jdi.request.EventRequest;
import com.sun.jdi.event.VMStartEvent;
public class ConfigurationDoneRequestHandler implements IDebugRequestHandler {
@@ -76,6 +77,7 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
if (context.isVmStopOnEntry()) {
DebugUtility.stopOnEntry(debugSession, context.getMainClass()).thenAccept(threadId -> {
context.getProtocolServer().sendEvent(new Events.StoppedEvent("entry", threadId));
+ context.getThreadCache().setThreadStoppedReason(threadId, "entry");
});
}
} else if (event instanceof VMDeathEvent) {
@@ -117,8 +119,10 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
JdiExceptionReference jdiException = new JdiExceptionReference(((ExceptionEvent) event).exception(),
((ExceptionEvent) event).catchLocation() == null);
context.getExceptionManager().setException(thread.uniqueID(), jdiException);
- context.getThreadCache().addEventThread(thread);
- context.getProtocolServer().sendEvent(new Events.StoppedEvent("exception", thread.uniqueID()));
+ context.getThreadCache().addEventThread(thread, "exception");
+ boolean allThreadsStopped = event.request() != null
+ && event.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
+ context.getProtocolServer().sendEvent(new Events.StoppedEvent("exception", thread.uniqueID(), allThreadsStopped));
debugEvent.shouldResume = false;
} else {
isImportantEvent = false;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java
index 19bbd7d62..6b9245166 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/InitializeRequestHandler.java
@@ -65,7 +65,9 @@ public CompletableFuture handle(Requests.Command command, Req
caps.supportsFunctionBreakpoints = true;
caps.supportsClipboardContext = true;
caps.supportsBreakpointLocationsRequest = true;
+ caps.supportsStepInTargetsRequest = true;
response.body = caps;
+ context.setInitialized(true);
return CompletableFuture.completedFuture(response);
}
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
index e5b580f50..e5662f936 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2018-2021 Microsoft Corporation and others.
+* Copyright (c) 2018-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -76,6 +77,12 @@ public List getTargetCommands() {
@Override
public CompletableFuture handle(Command command, Arguments arguments, Response response, IDebugAdapterContext context) {
+ if (!context.isInitialized()) {
+ final String errorMessage = "'launch' request is rejected since the debug session has not been initialized yet.";
+ logger.log(Level.SEVERE, errorMessage);
+ return CompletableFuture.completedFuture(
+ AdapterUtils.setErrorResponse(response, ErrorCode.LAUNCH_FAILURE, errorMessage));
+ }
LaunchArguments launchArguments = (LaunchArguments) arguments;
Map traceInfo = new HashMap<>();
traceInfo.put("asyncJDWP", context.asyncJDWP());
@@ -134,11 +141,50 @@ protected CompletableFuture handleLaunchCommand(Arguments arguments, R
}
} else if (launchArguments.shortenCommandLine == ShortenApproach.ARGFILE) {
try {
- Path tempfile = LaunchUtils.generateArgfile(launchArguments.classPaths, launchArguments.modulePaths);
- launchArguments.vmArgs += " \"@" + tempfile.toAbsolutePath().toString() + "\"";
- launchArguments.classPaths = new String[0];
- launchArguments.modulePaths = new String[0];
- context.setArgsfile(tempfile);
+ /**
+ * See the JDK spec https://docs.oracle.com/en/java/javase/18/docs/specs/man/java.html#java-command-line-argument-files.
+ * The argument file must contain only ASCII characters or characters in system default encoding that's ASCII friendly.
+ */
+ Charset systemCharset = LaunchUtils.getSystemCharset();
+ CharsetEncoder encoder = systemCharset.newEncoder();
+ String vmArgsForShorten = null;
+ String[] classPathsForShorten = null;
+ String[] modulePathsForShorten = null;
+ if (StringUtils.isNotBlank(launchArguments.vmArgs)) {
+ if (!encoder.canEncode(launchArguments.vmArgs)) {
+ logger.warning(String.format("Cannot generate the 'vmArgs' argument into the argfile because it contains characters "
+ + "that cannot be encoded in the system charset '%s'.", systemCharset.displayName()));
+ } else {
+ vmArgsForShorten = launchArguments.vmArgs;
+ }
+ }
+
+ if (ArrayUtils.isNotEmpty(launchArguments.classPaths)) {
+ if (!encoder.canEncode(String.join(File.pathSeparator, launchArguments.classPaths))) {
+ logger.warning(String.format("Cannot generate the '-cp' argument into the argfile because it contains characters "
+ + "that cannot be encoded in the system charset '%s'.", systemCharset.displayName()));
+ } else {
+ classPathsForShorten = launchArguments.classPaths;
+ }
+ }
+
+ if (ArrayUtils.isNotEmpty(launchArguments.modulePaths)) {
+ if (!encoder.canEncode(String.join(File.pathSeparator, launchArguments.modulePaths))) {
+ logger.warning(String.format("Cannot generate the '--module-path' argument into the argfile because it contains characters "
+ + "that cannot be encoded in the system charset '%s'.", systemCharset.displayName()));
+ } else {
+ modulePathsForShorten = launchArguments.modulePaths;
+ }
+ }
+
+ if (vmArgsForShorten != null || classPathsForShorten != null || modulePathsForShorten != null) {
+ Path tempfile = LaunchUtils.generateArgfile(vmArgsForShorten, classPathsForShorten, modulePathsForShorten, systemCharset);
+ launchArguments.vmArgs = (vmArgsForShorten == null ? launchArguments.vmArgs : "")
+ + " \"@" + tempfile.toAbsolutePath().toString() + "\"";
+ launchArguments.classPaths = (classPathsForShorten == null ? launchArguments.classPaths : new String[0]);
+ launchArguments.modulePaths = (modulePathsForShorten == null ? launchArguments.modulePaths : new String[0]);
+ context.setArgsfile(tempfile);
+ }
} catch (IOException e) {
logger.log(Level.SEVERE, String.format("Failed to create a temp argfile: %s", e.toString()), e);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java
index ca7d69a99..7370328b2 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.math.BigInteger;
+import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -36,15 +37,45 @@
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import com.microsoft.java.debug.core.Configuration;
-import com.microsoft.java.debug.core.adapter.AdapterUtils;
-
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
+import com.microsoft.java.debug.core.Configuration;
+import com.microsoft.java.debug.core.adapter.AdapterUtils;
+
public class LaunchUtils {
private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
private static Set tempFilesInUse = new HashSet<>();
+ private static final Charset SYSTEM_CHARSET;
+
+ static {
+ Charset result = null;
+ try {
+ // JEP 400: Java 17+ populates this system property.
+ String encoding = System.getProperty("native.encoding"); //$NON-NLS-1$
+ if (encoding != null && !encoding.isBlank()) {
+ result = Charset.forName(encoding);
+ } else {
+ // JVM internal property, works on older JVM's too
+ encoding = System.getProperty("sun.jnu.encoding"); //$NON-NLS-1$
+ if (encoding != null && !encoding.isBlank()) {
+ result = Charset.forName(encoding);
+ }
+ }
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "Error occurs during resolving system encoding", e);
+ }
+ if (result == null) {
+ // This is always UTF-8 on Java >= 18.
+ result = Charset.defaultCharset();
+ }
+ SYSTEM_CHARSET = result;
+ }
+
+ public static Charset getSystemCharset() {
+ return SYSTEM_CHARSET;
+ }
/**
* Generate the classpath parameters to a temporary classpath.jar.
@@ -64,7 +95,7 @@ public static synchronized Path generateClasspathJar(String[] classPaths) throws
// In jar manifest, the absolute path C:\a.jar should be converted to the url style file:///C:/a.jar
String classpathValue = String.join(" ", classpathUrls);
attributes.put(Attributes.Name.CLASS_PATH, classpathValue);
- String baseName = "cp_" + getMd5(classpathValue);
+ String baseName = "cp_" + getSha256(classpathValue);
cleanupTempFiles(baseName, ".jar");
Path tempfile = createTempFile(baseName, ".jar");
JarOutputStream jar = new JarOutputStream(new FileOutputStream(tempfile.toFile()), manifest);
@@ -81,10 +112,14 @@ public static synchronized Path generateClasspathJar(String[] classPaths) throws
* @return the file path of the generated argfile
* @throws IOException Some errors occur during generating the argfile
*/
- public static synchronized Path generateArgfile(String[] classPaths, String[] modulePaths) throws IOException {
+ public static synchronized Path generateArgfile(String vmArgs, String[] classPaths, String[] modulePaths, Charset encoding) throws IOException {
String argfile = "";
+ if (StringUtils.isNotBlank(vmArgs)) {
+ argfile += vmArgs;
+ }
+
if (ArrayUtils.isNotEmpty(classPaths)) {
- argfile = "-cp \"" + String.join(File.pathSeparator, classPaths) + "\"";
+ argfile += " -cp \"" + String.join(File.pathSeparator, classPaths) + "\"";
}
if (ArrayUtils.isNotEmpty(modulePaths)) {
@@ -92,10 +127,10 @@ public static synchronized Path generateArgfile(String[] classPaths, String[] mo
}
argfile = argfile.replace("\\", "\\\\");
- String baseName = "cp_" + getMd5(argfile);
+ String baseName = "cp_" + getSha256(argfile);
cleanupTempFiles(baseName, ".argfile");
Path tempfile = createTempFile(baseName, ".argfile");
- Files.write(tempfile, argfile.getBytes());
+ Files.writeString(tempfile, argfile, encoding);
lockTempLaunchFile(tempfile);
return tempfile;
@@ -329,12 +364,15 @@ private static Path createTempFile(String baseName, String suffix) throws IOExce
}
}
- private static String getMd5(String input) {
+ private static String getSha256(String input) {
try {
- MessageDigest md = MessageDigest.getInstance("MD5");
+ MessageDigest md = MessageDigest.getInstance("SHA-256");
byte[] messageDigest = md.digest(input.getBytes());
- BigInteger md5 = new BigInteger(1, messageDigest);
- return md5.toString(Character.MAX_RADIX);
+ // Use only first 16 bytes to keep filename shorter
+ byte[] truncated = new byte[16];
+ System.arraycopy(messageDigest, 0, truncated, 0, 16);
+ BigInteger hash = new BigInteger(1, truncated);
+ return hash.toString(Character.MAX_RADIX);
} catch (NoSuchAlgorithmException e) {
return Integer.toString(input.hashCode(), Character.MAX_RADIX);
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RefreshFramesHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RefreshFramesHandler.java
new file mode 100644
index 000000000..b91daaf80
--- /dev/null
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RefreshFramesHandler.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+* Copyright (c) 2023 Microsoft Corporation and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Microsoft Corporation - initial API and implementation
+*******************************************************************************/
+
+package com.microsoft.java.debug.core.adapter.handler;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+import com.microsoft.java.debug.core.AsyncJdwpUtils;
+import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;
+import com.microsoft.java.debug.core.adapter.IDebugRequestHandler;
+import com.microsoft.java.debug.core.protocol.Events.StoppedEvent;
+import com.microsoft.java.debug.core.protocol.Messages.Response;
+import com.microsoft.java.debug.core.protocol.Requests.Arguments;
+import com.microsoft.java.debug.core.protocol.Requests.Command;
+import com.microsoft.java.debug.core.protocol.Requests.RefreshFramesArguments;
+import com.sun.jdi.ObjectCollectedException;
+import com.sun.jdi.ThreadReference;
+
+public class RefreshFramesHandler implements IDebugRequestHandler {
+
+ @Override
+ public List getTargetCommands() {
+ return Arrays.asList(Command.REFRESHFRAMES);
+ }
+
+ @Override
+ public CompletableFuture handle(Command command, Arguments arguments, Response response,
+ IDebugAdapterContext context) {
+ RefreshFramesArguments refreshArgs = (RefreshFramesArguments) arguments;
+ String[] affectedRootPaths = refreshArgs == null ? null : refreshArgs.affectedRootPaths;
+ List pausedThreads = getPausedThreads(context);
+ for (long threadId : pausedThreads) {
+ if (affectedRootPaths == null || affectedRootPaths.length == 0) {
+ refreshFrames(threadId, context);
+ continue;
+ }
+
+ Set decompiledClasses = context.getThreadCache().getDecompiledClassesByThread(threadId);
+ if (decompiledClasses == null || decompiledClasses.isEmpty()) {
+ continue;
+ }
+
+ if (anyInAffectedRootPaths(decompiledClasses, affectedRootPaths)) {
+ refreshFrames(threadId, context);
+ }
+ }
+
+ return CompletableFuture.completedFuture(response);
+ }
+
+ List getPausedThreads(IDebugAdapterContext context) {
+ List results = new ArrayList<>();
+ List> futures = new ArrayList<>();
+ List threads = context.getThreadCache().visibleThreads(context);
+ for (ThreadReference thread : threads) {
+ if (context.asyncJDWP()) {
+ futures.add(AsyncJdwpUtils.supplyAsync(() -> {
+ try {
+ if (thread.isSuspended()) {
+ return thread.uniqueID();
+ }
+ } catch (ObjectCollectedException ex) {
+ // Ignore it if the thread is garbage collected.
+ }
+
+ return -1L;
+ }));
+ } else {
+ try {
+ if (thread.isSuspended()) {
+ results.add(thread.uniqueID());
+ }
+ } catch (ObjectCollectedException ex) {
+ // Ignore it if the thread is garbage collected.
+ }
+ }
+ }
+
+ List awaitedResutls = AsyncJdwpUtils.await(futures);
+ for (Long threadId : awaitedResutls) {
+ if (threadId > 0) {
+ results.add(threadId);
+ }
+ }
+
+ return results;
+ }
+
+ /**
+ * See https://github.com/microsoft/vscode/issues/188606,
+ * VS Code doesn't provide a simple way to refetch the stack frames.
+ * We're going to resend a thread stopped event to trick the client
+ * into refetching the thread stack frames.
+ */
+ void refreshFrames(long threadId, IDebugAdapterContext context) {
+ StoppedEvent stoppedEvent = new StoppedEvent(context.getThreadCache().getThreadStoppedReason(threadId), threadId);
+ stoppedEvent.preserveFocusHint = true;
+ context.getProtocolServer().sendEvent(stoppedEvent);
+ }
+
+ boolean anyInAffectedRootPaths(Collection classes, String[] affectedRootPaths) {
+ if (affectedRootPaths == null || affectedRootPaths.length == 0) {
+ return true;
+ }
+
+ for (String classUri : classes) {
+ // decompiled class uri is like 'jdt://contents/rt.jar/java.io/PrintStream.class?=1.helloworld/%5C/usr%5C/lib%5C/jvm%5C/
+ // java-8-oracle%5C/jre%5C/lib%5C/rt.jar%3Cjava.io(PrintStream.class'.
+ if (classUri.startsWith("jdt://contents/")) {
+ String jarName = classUri.substring("jdt://contents/".length());
+ int sep = jarName.indexOf("/");
+ jarName = sep >= 0 ? jarName.substring(0, sep) : jarName;
+ for (String affectedRootPath : affectedRootPaths) {
+ if (affectedRootPath.endsWith("/" + jarName) || affectedRootPath.endsWith("\\" + jarName)) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RestartFrameHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RestartFrameHandler.java
index 2023209f4..26ebefaee 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RestartFrameHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RestartFrameHandler.java
@@ -33,6 +33,7 @@
import com.sun.jdi.IncompatibleThreadStateException;
import com.sun.jdi.StackFrame;
import com.sun.jdi.ThreadReference;
+import com.sun.jdi.request.EventRequest;
import com.sun.jdi.request.StepRequest;
/**
@@ -121,7 +122,9 @@ private void stepInto(IDebugAdapterContext context, ThreadReference thread) {
debugEvent.shouldResume = false;
// Have to send two events to keep the UI sync with the step in operations:
context.getProtocolServer().sendEvent(new Events.ContinuedEvent(thread.uniqueID()));
- context.getProtocolServer().sendEvent(new Events.StoppedEvent("restartframe", thread.uniqueID()));
+ boolean allThreadsStopped = request.suspendPolicy() == EventRequest.SUSPEND_ALL;
+ context.getProtocolServer().sendEvent(new Events.StoppedEvent("restartframe", thread.uniqueID(), allThreadsStopped));
+ context.getThreadCache().setThreadStoppedReason(thread.uniqueID(), "restartframe");
});
request.enable();
thread.resume();
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
index 7fe6c3fdd..0f171486e 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
@@ -24,6 +24,8 @@
import com.microsoft.java.debug.core.Configuration;
import com.microsoft.java.debug.core.DebugException;
+import com.microsoft.java.debug.core.DebugSettings;
+import com.microsoft.java.debug.core.DebugSettings.Switch;
import com.microsoft.java.debug.core.IBreakpoint;
import com.microsoft.java.debug.core.IDebugSession;
import com.microsoft.java.debug.core.IEvaluatableBreakpoint;
@@ -209,16 +211,20 @@ private void registerBreakpointHandler(IDebugAdapterContext context) {
if (resume) {
debugEvent.eventSet.resume();
} else {
- context.getThreadCache().addEventThread(bpThread);
+ context.getThreadCache().addEventThread(bpThread, breakpointName);
+ boolean allThreadsStopped = event.request() != null
+ && event.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
context.getProtocolServer().sendEvent(new Events.StoppedEvent(
- breakpointName, bpThread.uniqueID()));
+ breakpointName, bpThread.uniqueID(), allThreadsStopped));
}
});
});
} else {
- context.getThreadCache().addEventThread(bpThread);
+ context.getThreadCache().addEventThread(bpThread, breakpointName);
+ boolean allThreadsStopped = event.request() != null
+ && event.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
context.getProtocolServer().sendEvent(new Events.StoppedEvent(
- breakpointName, bpThread.uniqueID()));
+ breakpointName, bpThread.uniqueID(), allThreadsStopped));
}
debugEvent.shouldResume = false;
}
@@ -296,7 +302,8 @@ public static boolean handleEvaluationResult(IDebugAdapterContext context, Threa
private Types.Breakpoint convertDebuggerBreakpointToClient(IBreakpoint breakpoint, IDebugAdapterContext context) {
int id = (int) breakpoint.getProperty("id");
boolean verified = breakpoint.getProperty("verified") != null && (boolean) breakpoint.getProperty("verified");
- int lineNumber = AdapterUtils.convertLineNumber(breakpoint.getLineNumber(), context.isDebuggerLinesStartAt1(), context.isClientLinesStartAt1());
+ int lineNumber = AdapterUtils.convertLineNumber(breakpoint.sourceLocation().lineNumberInSourceFile(),
+ context.isDebuggerLinesStartAt1(), context.isClientLinesStartAt1());
return new Types.Breakpoint(id, verified, lineNumber, "");
}
@@ -318,6 +325,19 @@ private IBreakpoint[] convertClientBreakpointsToDebugger(String sourceFile, Type
} catch (NumberFormatException e) {
hitCount = 0; // If hitCount is an illegal number, ignore hitCount condition.
}
+
+ if (DebugSettings.getCurrent().debugSupportOnDecompiledSource == Switch.ON) {
+ // Align the decompiled line with the original line.
+ int[] lineMappings = sourceProvider.getDecompiledLineMappings(sourceFile);
+ if (locations[i] != null && lineMappings != null) {
+ int lineNumberInSourceFile = locations[i].lineNumber();
+ int[] originalLines = AdapterUtils.binarySearchMappedLines(lineMappings, lineNumberInSourceFile);
+ if (originalLines != null && originalLines.length > 0) {
+ locations[i].setLineNumberInSourceFile(lineNumberInSourceFile);
+ locations[i].setLineNumber(originalLines[0]);
+ }
+ }
+ }
breakpoints[i] = context.getDebugSession().createBreakpoint(locations[i], hitCount, sourceBreakpoints[i].condition,
sourceBreakpoints[i].logMessage);
if (sourceProvider.supportsRealtimeBreakpointVerification() && StringUtils.isNotBlank(locations[i].className())) {
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetDataBreakpointsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetDataBreakpointsRequestHandler.java
index 6d3e8c0b1..c7c0995fe 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetDataBreakpointsRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetDataBreakpointsRequestHandler.java
@@ -41,6 +41,7 @@
import com.sun.jdi.ThreadReference;
import com.sun.jdi.event.Event;
import com.sun.jdi.event.WatchpointEvent;
+import com.sun.jdi.request.EventRequest;
public class SetDataBreakpointsRequestHandler implements IDebugRequestHandler {
private boolean registered = false;
@@ -151,14 +152,18 @@ private void registerWatchpointHandler(IDebugAdapterContext context) {
if (resume) {
debugEvent.eventSet.resume();
} else {
- context.getThreadCache().addEventThread(bpThread);
- context.getProtocolServer().sendEvent(new Events.StoppedEvent("data breakpoint", bpThread.uniqueID()));
+ context.getThreadCache().addEventThread(bpThread, "data breakpoint");
+ boolean allThreadsStopped = event.request() != null
+ && event.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
+ context.getProtocolServer().sendEvent(new Events.StoppedEvent("data breakpoint", bpThread.uniqueID(), allThreadsStopped));
}
});
});
} else {
- context.getThreadCache().addEventThread(bpThread);
- context.getProtocolServer().sendEvent(new Events.StoppedEvent("data breakpoint", bpThread.uniqueID()));
+ context.getThreadCache().addEventThread(bpThread, "data breakpoint");
+ boolean allThreadsStopped = event.request() != null
+ && event.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
+ context.getProtocolServer().sendEvent(new Events.StoppedEvent("data breakpoint", bpThread.uniqueID(), allThreadsStopped));
}
debugEvent.shouldResume = false;
});
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java
index 3a4e642c8..b51c5fe27 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java
@@ -26,8 +26,8 @@
import com.microsoft.java.debug.core.adapter.IDebugRequestHandler;
import com.microsoft.java.debug.core.protocol.Messages.Response;
import com.microsoft.java.debug.core.protocol.Requests.Arguments;
-import com.microsoft.java.debug.core.protocol.Requests.ClassFilters;
import com.microsoft.java.debug.core.protocol.Requests.Command;
+import com.microsoft.java.debug.core.protocol.Requests.ExceptionFilters;
import com.microsoft.java.debug.core.protocol.Requests.SetExceptionBreakpointsArguments;
import com.microsoft.java.debug.core.protocol.Types;
import com.sun.jdi.event.VMDeathEvent;
@@ -38,6 +38,7 @@ public class SetExceptionBreakpointsRequestHandler implements IDebugRequestHandl
private boolean isInitialized = false;
private boolean notifyCaught = false;
private boolean notifyUncaught = false;
+ private boolean asyncJDWP = false;
@Override
public List getTargetCommands() {
@@ -53,6 +54,7 @@ public synchronized CompletableFuture handle(Command command, Argument
if (!isInitialized) {
isInitialized = true;
debugSession = context.getDebugSession();
+ asyncJDWP = context.asyncJDWP();
DebugSettings.addDebugSettingChangeListener(this);
debugSession.getEventHub().events().subscribe(debugEvent -> {
if (debugEvent.event instanceof VMDeathEvent
@@ -77,10 +79,11 @@ public synchronized CompletableFuture handle(Command command, Argument
}
private void setExceptionBreakpoints(IDebugSession debugSession, boolean notifyCaught, boolean notifyUncaught) {
- ClassFilters exceptionFilters = DebugSettings.getCurrent().exceptionFilters;
+ ExceptionFilters exceptionFilters = DebugSettings.getCurrent().exceptionFilters;
+ String[] exceptionTypes = (exceptionFilters == null ? null : exceptionFilters.exceptionTypes);
String[] classFilters = (exceptionFilters == null ? null : exceptionFilters.allowClasses);
String[] classExclusionFilters = (exceptionFilters == null ? null : exceptionFilters.skipClasses);
- debugSession.setExceptionBreakpoints(notifyCaught, notifyUncaught, classFilters, classExclusionFilters);
+ debugSession.setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters, this.asyncJDWP);
}
@Override
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetFunctionBreakpointsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetFunctionBreakpointsRequestHandler.java
index 59a948d37..01b5e9619 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetFunctionBreakpointsRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetFunctionBreakpointsRequestHandler.java
@@ -40,6 +40,7 @@
import com.microsoft.java.debug.core.protocol.Types.FunctionBreakpoint;
import com.sun.jdi.ThreadReference;
import com.sun.jdi.event.MethodEntryEvent;
+import com.sun.jdi.request.EventRequest;
public class SetFunctionBreakpointsRequestHandler implements IDebugRequestHandler {
private boolean registered = false;
@@ -165,17 +166,21 @@ private void registerMethodBreakpointHandler(IDebugAdapterContext context) {
if (resume) {
debugEvent.eventSet.resume();
} else {
- context.getThreadCache().addEventThread(bpThread);
+ context.getThreadCache().addEventThread(bpThread, "function breakpoint");
+ boolean allThreadsStopped = methodEntryEvent.request() != null
+ && methodEntryEvent.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
context.getProtocolServer().sendEvent(new Events.StoppedEvent(
- "function breakpoint", bpThread.uniqueID()));
+ "function breakpoint", bpThread.uniqueID(), allThreadsStopped));
}
});
});
} else {
- context.getThreadCache().addEventThread(bpThread);
+ context.getThreadCache().addEventThread(bpThread, "function breakpoint");
+ boolean allThreadsStopped = methodEntryEvent.request() != null
+ && methodEntryEvent.request().suspendPolicy() == EventRequest.SUSPEND_ALL;
context.getProtocolServer()
- .sendEvent(new Events.StoppedEvent("function breakpoint", bpThread.uniqueID()));
+ .sendEvent(new Events.StoppedEvent("function breakpoint", bpThread.uniqueID(), allThreadsStopped));
}
debugEvent.shouldResume = false;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java
index f22966b03..6f54bcedb 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java
@@ -15,8 +15,10 @@
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
@@ -24,15 +26,21 @@
import org.apache.commons.lang3.StringUtils;
+import com.google.gson.JsonObject;
import com.microsoft.java.debug.core.AsyncJdwpUtils;
+import com.microsoft.java.debug.core.DebugSettings;
+import com.microsoft.java.debug.core.DebugSettings.Switch;
import com.microsoft.java.debug.core.DebugUtility;
import com.microsoft.java.debug.core.IBreakpoint;
import com.microsoft.java.debug.core.adapter.AdapterUtils;
import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;
import com.microsoft.java.debug.core.adapter.IDebugRequestHandler;
import com.microsoft.java.debug.core.adapter.ISourceLookUpProvider;
+import com.microsoft.java.debug.core.adapter.Source;
+import com.microsoft.java.debug.core.adapter.SourceType;
import com.microsoft.java.debug.core.adapter.formatter.SimpleTypeFormatter;
import com.microsoft.java.debug.core.adapter.variables.StackFrameReference;
+import com.microsoft.java.debug.core.protocol.Events.TelemetryEvent;
import com.microsoft.java.debug.core.protocol.Messages.Response;
import com.microsoft.java.debug.core.protocol.Requests.Arguments;
import com.microsoft.java.debug.core.protocol.Requests.Command;
@@ -52,6 +60,7 @@
import com.sun.jdi.request.BreakpointRequest;
public class StackTraceRequestHandler implements IDebugRequestHandler {
+ private ThreadLocal isDecompilerInvoked = new ThreadLocal<>();
@Override
public List getTargetCommands() {
@@ -60,22 +69,31 @@ public List getTargetCommands() {
@Override
public CompletableFuture handle(Command command, Arguments arguments, Response response, IDebugAdapterContext context) {
+ final long startAt = System.currentTimeMillis();
+ isDecompilerInvoked.set(false);
StackTraceArguments stacktraceArgs = (StackTraceArguments) arguments;
List result = new ArrayList<>();
if (stacktraceArgs.startFrame < 0 || stacktraceArgs.levels < 0) {
response.body = new Responses.StackTraceResponseBody(result, 0);
return CompletableFuture.completedFuture(response);
}
- ThreadReference thread = context.getThreadCache().getThread(stacktraceArgs.threadId);
+ long threadId = stacktraceArgs.threadId;
+ ThreadReference thread = context.getThreadCache().getThread(threadId);
if (thread == null) {
- thread = DebugUtility.getThread(context.getDebugSession(), stacktraceArgs.threadId);
+ thread = DebugUtility.getThread(context.getDebugSession(), threadId);
}
int totalFrames = 0;
if (thread != null) {
+ Set decompiledClasses = new LinkedHashSet<>();
try {
// Thread state has changed and then invalidate the stack frame cache.
if (stacktraceArgs.startFrame == 0) {
context.getStackFrameManager().clearStackFrames(thread);
+ } else {
+ Set existing = context.getThreadCache().getDecompiledClassesByThread(threadId);
+ if (existing != null) {
+ decompiledClasses.addAll(existing);
+ }
}
totalFrames = thread.frameCount();
@@ -89,10 +107,16 @@ public CompletableFuture handle(Command command, Arguments arguments,
StackFrame[] frames = context.getStackFrameManager().reloadStackFrames(thread, stacktraceArgs.startFrame, count);
List jdiFrames = resolveStackFrameInfos(frames, context.asyncJDWP());
for (int i = 0; i < count; i++) {
- StackFrameReference stackframe = new StackFrameReference(thread, stacktraceArgs.startFrame + i);
- int frameId = context.getRecyclableIdPool().addObject(stacktraceArgs.threadId, stackframe);
+ StackFrameReference frameReference = new StackFrameReference(thread, stacktraceArgs.startFrame + i);
+ int frameId = context.getRecyclableIdPool().addObject(stacktraceArgs.threadId, frameReference);
StackFrameInfo jdiFrame = jdiFrames.get(i);
- result.add(convertDebuggerStackFrameToClient(jdiFrame, frameId, i == 0, context));
+ Types.StackFrame lspFrame = convertDebuggerStackFrameToClient(jdiFrame, frameId, i == 0, context);
+ result.add(lspFrame);
+ frameReference.setSource(lspFrame.source);
+ int jdiLineNumber = AdapterUtils.convertLineNumber(jdiFrame.lineNumber, context.isDebuggerLinesStartAt1(), context.isClientLinesStartAt1());
+ if (jdiLineNumber != lspFrame.line && lspFrame.source != null && lspFrame.source.path != null) {
+ decompiledClasses.add(lspFrame.source.path);
+ }
}
} catch (IncompatibleThreadStateException | IndexOutOfBoundsException | URISyntaxException
| AbsentInformationException | ObjectCollectedException
@@ -101,14 +125,25 @@ public CompletableFuture handle(Command command, Arguments arguments,
// 1. the vscode has wrong parameter/wrong uri
// 2. the thread actually terminates
// TODO: should record a error log here.
+ } finally {
+ context.getThreadCache().setDecompiledClassesByThread(threadId, decompiledClasses);
}
}
response.body = new Responses.StackTraceResponseBody(result, totalFrames);
+ long duration = System.currentTimeMillis() - startAt;
+ JsonObject properties = new JsonObject();
+ properties.addProperty("command", "stackTrace");
+ properties.addProperty("duration", duration);
+ properties.addProperty("decompileSupport", DebugSettings.getCurrent().debugSupportOnDecompiledSource.toString());
+ if (isDecompilerInvoked.get() != null) {
+ properties.addProperty("isDecompilerInvoked", Boolean.toString(isDecompilerInvoked.get()));
+ }
+ context.getProtocolServer().sendEvent(new TelemetryEvent("dap", properties));
return CompletableFuture.completedFuture(response);
}
private static List resolveStackFrameInfos(StackFrame[] frames, boolean async)
- throws AbsentInformationException, IncompatibleThreadStateException {
+ throws AbsentInformationException, IncompatibleThreadStateException {
List jdiFrames = new ArrayList<>();
List> futures = new ArrayList<>();
for (StackFrame frame : frames) {
@@ -187,6 +222,17 @@ private Types.StackFrame convertDebuggerStackFrameToClient(StackFrameInfo jdiFra
// display "Unknown Source" in the Call Stack View.
clientSource = null;
}
+ // DAP specifies lineNumber to be set to 0 when unavailable
+ clientLineNumber = 0;
+ } else if (DebugSettings.getCurrent().debugSupportOnDecompiledSource == Switch.ON
+ && clientSource != null && clientSource.path != null) {
+ // Align the original line with the decompiled line.
+ int[] lineMappings = context.getProvider(ISourceLookUpProvider.class).getOriginalLineMappings(clientSource.path);
+ int[] renderLines = AdapterUtils.binarySearchMappedLines(lineMappings, clientLineNumber);
+ if (renderLines != null && renderLines.length > 0) {
+ clientLineNumber = renderLines[0];
+ isDecompilerInvoked.set(true);
+ }
}
int clientColumnNumber = context.isClientColumnsStartAt1() ? 1 : 0;
@@ -202,7 +248,7 @@ private Types.StackFrame convertDebuggerStackFrameToClient(StackFrameInfo jdiFra
});
if (match) {
clientColumnNumber = AdapterUtils.convertColumnNumber(breakpoint.getColumnNumber(),
- context.isDebuggerColumnsStartAt1(), context.isClientColumnsStartAt1());
+ context.isDebuggerColumnsStartAt1(), context.isClientColumnsStartAt1());
}
}
}
@@ -214,33 +260,44 @@ private Types.StackFrame convertDebuggerStackFrameToClient(StackFrameInfo jdiFra
/**
* Find the source mapping for the specified source file name.
*/
- public static Types.Source convertDebuggerSourceToClient(String fullyQualifiedName, String sourceName, String relativeSourcePath,
+ public static Types.Source convertDebuggerSourceToClient(String fullyQualifiedName, String sourceName,
+ String relativeSourcePath,
IDebugAdapterContext context) throws URISyntaxException {
+
// use a lru cache for better performance
- String uri = context.getSourceLookupCache().computeIfAbsent(fullyQualifiedName, key -> {
- String fromProvider = context.getProvider(ISourceLookUpProvider.class).getSourceFileURI(key, relativeSourcePath);
- // avoid return null which will cause the compute function executed again
- return StringUtils.isBlank(fromProvider) ? "" : fromProvider;
+ Source source = context.getSourceLookupCache().computeIfAbsent(fullyQualifiedName, key -> {
+ Source result = context.getProvider(ISourceLookUpProvider.class).getSource(key, relativeSourcePath);
+ if (result == null) {
+ return new Source("", SourceType.LOCAL);
+ }
+ return result;
});
+ Integer sourceReference = 0;
+ String uri = source.getUri();
+
+ if (source.getType().equals(SourceType.REMOTE)) {
+ sourceReference = context.createSourceReference(source.getUri());
+ }
+
if (!StringUtils.isBlank(uri)) {
// The Source.path could be a file system path or uri string.
if (uri.startsWith("file:")) {
String clientPath = AdapterUtils.convertPath(uri, context.isDebuggerPathsAreUri(), context.isClientPathsAreUri());
- return new Types.Source(sourceName, clientPath, 0);
+ return new Types.Source(sourceName, clientPath, sourceReference);
} else {
// If the debugger returns uri in the Source.path for the StackTrace response, VSCode client will try to find a TextDocumentContentProvider
// to render the contents.
// Language Support for Java by Red Hat extension has already registered a jdt TextDocumentContentProvider to parse the jdt-based uri.
// The jdt uri looks like 'jdt://contents/rt.jar/java.io/PrintStream.class?=1.helloworld/%5C/usr%5C/lib%5C/jvm%5C/java-8-oracle%5C/jre%5C/
// lib%5C/rt.jar%3Cjava.io(PrintStream.class'.
- return new Types.Source(sourceName, uri, 0);
+ return new Types.Source(sourceName, uri, sourceReference);
}
} else {
// If the source lookup engine cannot find the source file, then lookup it in the source directories specified by user.
String absoluteSourcepath = AdapterUtils.sourceLookup(context.getSourcePaths(), relativeSourcePath);
if (absoluteSourcepath != null) {
- return new Types.Source(sourceName, absoluteSourcepath, 0);
+ return new Types.Source(sourceName, absoluteSourcepath, sourceReference);
} else {
return null;
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepInTargetsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepInTargetsRequestHandler.java
new file mode 100644
index 000000000..5b3b735fe
--- /dev/null
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepInTargetsRequestHandler.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+* Copyright (c) 2022 Microsoft Corporation and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Gayan Perera - initial API and implementation
+*******************************************************************************/
+package com.microsoft.java.debug.core.adapter.handler;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.microsoft.java.debug.core.Configuration;
+import com.microsoft.java.debug.core.adapter.AdapterUtils;
+import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;
+import com.microsoft.java.debug.core.adapter.IDebugRequestHandler;
+import com.microsoft.java.debug.core.adapter.ISourceLookUpProvider;
+import com.microsoft.java.debug.core.adapter.ISourceLookUpProvider.MethodInvocation;
+import com.microsoft.java.debug.core.adapter.variables.StackFrameReference;
+import com.microsoft.java.debug.core.protocol.Messages.Response;
+import com.microsoft.java.debug.core.protocol.Requests.Arguments;
+import com.microsoft.java.debug.core.protocol.Requests.Command;
+import com.microsoft.java.debug.core.protocol.Requests.StepInTargetsArguments;
+import com.microsoft.java.debug.core.protocol.Responses.StepInTargetsResponse;
+import com.microsoft.java.debug.core.protocol.Types.Source;
+import com.microsoft.java.debug.core.protocol.Types.StepInTarget;
+import com.sun.jdi.AbsentInformationException;
+import com.sun.jdi.ReferenceType;
+import com.sun.jdi.StackFrame;
+
+public class StepInTargetsRequestHandler implements IDebugRequestHandler {
+ private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
+
+ @Override
+ public List getTargetCommands() {
+ return Arrays.asList(Command.STEPIN_TARGETS);
+ }
+
+ @Override
+ public CompletableFuture handle(Command command, Arguments arguments, Response response,
+ IDebugAdapterContext context) {
+ final StepInTargetsArguments stepInTargetsArguments = (StepInTargetsArguments) arguments;
+
+ final int frameId = stepInTargetsArguments.frameId;
+ return CompletableFuture.supplyAsync(() -> {
+ response.body = new StepInTargetsResponse(
+ findFrame(frameId, context).map(f -> findTargets(f, context))
+ .orElse(Collections.emptyList()).toArray(StepInTarget[]::new));
+ return response;
+ });
+ }
+
+ private Optional findFrame(int frameId, IDebugAdapterContext context) {
+ Object object = context.getRecyclableIdPool().getObjectById(frameId);
+ if (object instanceof StackFrameReference) {
+ return Optional.of((StackFrameReference) object);
+ }
+ return Optional.empty();
+ }
+
+ private List findTargets(StackFrameReference frameReference, IDebugAdapterContext context) {
+ StackFrame stackframe = context.getStackFrameManager().getStackFrame(frameReference);
+ if (stackframe == null) {
+ return Collections.emptyList();
+ }
+
+ Source source = frameReference.getSource() == null ? findSource(stackframe, context) : frameReference.getSource();
+ if (source == null) {
+ return Collections.emptyList();
+ }
+
+ String sourceUri = AdapterUtils.convertPath(source.path, AdapterUtils.isUri(source.path), true);
+ if (sourceUri == null) {
+ return Collections.emptyList();
+ }
+
+ ISourceLookUpProvider sourceLookUpProvider = context.getProvider(ISourceLookUpProvider.class);
+ List invocations = sourceLookUpProvider.findMethodInvocations(sourceUri, stackframe.location().lineNumber());
+ if (invocations.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ long threadId = stackframe.thread().uniqueID();
+ List targets = new ArrayList<>(invocations.size());
+ for (MethodInvocation methodInvocation : invocations) {
+ int id = context.getRecyclableIdPool().addObject(threadId, methodInvocation);
+ StepInTarget target = new StepInTarget(id, methodInvocation.expression);
+ target.column = AdapterUtils.convertColumnNumber(methodInvocation.columnStart,
+ context.isDebuggerColumnsStartAt1(), context.isClientColumnsStartAt1());
+ target.endColumn = AdapterUtils.convertColumnNumber(methodInvocation.columnEnd,
+ context.isDebuggerColumnsStartAt1(), context.isClientColumnsStartAt1());
+ target.line = AdapterUtils.convertLineNumber(methodInvocation.lineStart,
+ context.isDebuggerLinesStartAt1(), context.isClientLinesStartAt1());
+ target.endLine = AdapterUtils.convertLineNumber(methodInvocation.lineEnd,
+ context.isDebuggerLinesStartAt1(), context.isClientLinesStartAt1());
+ targets.add(target);
+ }
+
+ // TODO remove the executed method calls.
+ return targets;
+ }
+
+ private Source findSource(StackFrame frame, IDebugAdapterContext context) {
+ ReferenceType declaringType = frame.location().declaringType();
+ String typeName = declaringType.name();
+ String sourceName = null;
+ String sourcePath = null;
+ try {
+ // When the .class file doesn't contain source information in meta data,
+ // invoking ReferenceType#sourceName() would throw AbsentInformationException.
+ sourceName = declaringType.sourceName();
+ sourcePath = declaringType.sourcePaths(null).get(0);
+ } catch (AbsentInformationException e) {
+ String enclosingType = AdapterUtils.parseEnclosingType(typeName);
+ sourceName = enclosingType.substring(enclosingType.lastIndexOf('.') + 1) + ".java";
+ sourcePath = enclosingType.replace('.', File.separatorChar) + ".java";
+ }
+
+ try {
+ return StackTraceRequestHandler.convertDebuggerSourceToClient(typeName, sourceName, sourcePath, context);
+ } catch (URISyntaxException e) {
+ logger.log(Level.SEVERE, "Failed to resolve the source info of the stack frame.", e);
+ }
+
+ return null;
+ }
+}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepRequestHandler.java
index 51e41bafc..e8f782668 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepRequestHandler.java
@@ -14,6 +14,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
@@ -29,16 +30,21 @@
import com.microsoft.java.debug.core.adapter.ErrorCode;
import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;
import com.microsoft.java.debug.core.adapter.IDebugRequestHandler;
+import com.microsoft.java.debug.core.adapter.ISourceLookUpProvider.MethodInvocation;
import com.microsoft.java.debug.core.protocol.Events;
import com.microsoft.java.debug.core.protocol.Messages.Response;
import com.microsoft.java.debug.core.protocol.Requests.Arguments;
import com.microsoft.java.debug.core.protocol.Requests.Command;
import com.microsoft.java.debug.core.protocol.Requests.StepArguments;
import com.microsoft.java.debug.core.protocol.Requests.StepFilters;
+import com.microsoft.java.debug.core.protocol.Requests.StepInArguments;
+import com.sun.jdi.ClassType;
import com.sun.jdi.IncompatibleThreadStateException;
+import com.sun.jdi.InterfaceType;
import com.sun.jdi.Location;
import com.sun.jdi.Method;
import com.sun.jdi.ObjectReference;
+import com.sun.jdi.ReferenceType;
import com.sun.jdi.StackFrame;
import com.sun.jdi.ThreadReference;
import com.sun.jdi.Value;
@@ -70,7 +76,9 @@ public CompletableFuture handle(Command command, Arguments arguments,
return AdapterUtils.createAsyncErrorResponse(response, ErrorCode.EMPTY_DEBUG_SESSION, "Debug Session doesn't exist.");
}
- long threadId = ((StepArguments) arguments).threadId;
+ StepArguments stepArguments = (StepArguments) arguments;
+ long threadId = stepArguments.threadId;
+ int targetId = (stepArguments instanceof StepInArguments) ? ((StepInArguments) stepArguments).targetId : 0;
ThreadReference thread = context.getThreadCache().getThread(threadId);
if (thread == null) {
thread = DebugUtility.getThread(context.getDebugSession(), threadId);
@@ -107,11 +115,13 @@ public CompletableFuture handle(Command command, Arguments arguments,
threadState.pendingMethodExitRequest = thread.virtualMachine().eventRequestManager().createMethodExitRequest();
threadState.pendingMethodExitRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
+ threadState.targetStepIn = targetId > 0
+ ? (MethodInvocation) context.getRecyclableIdPool().getObjectById(targetId) : null;
if (context.asyncJDWP()) {
List> futures = new ArrayList<>();
futures.add(AsyncJdwpUtils.runAsync(() -> {
+ // JDWP Command: TR_FRAMES
try {
- // JDWP Command: TR_FRAMES
threadState.topFrame = getTopFrame(targetThread);
threadState.stepLocation = threadState.topFrame.location();
threadState.pendingMethodExitRequest.addClassFilter(threadState.stepLocation.declaringType());
@@ -126,8 +136,8 @@ public CompletableFuture handle(Command command, Arguments arguments,
// ignore
}
}
- } catch (IncompatibleThreadStateException e) {
- throw new CompletionException(e);
+ } catch (IncompatibleThreadStateException e1) {
+ throw new CompletionException(e1);
}
}));
futures.add(AsyncJdwpUtils.runAsync(
@@ -159,8 +169,8 @@ public CompletableFuture handle(Command command, Arguments arguments,
// JDWP Command: ER_SET
threadState.pendingMethodExitRequest.enable();
} else {
- threadState.stackDepth = targetThread.frameCount();
threadState.topFrame = getTopFrame(targetThread);
+ threadState.stackDepth = targetThread.frameCount();
threadState.stepLocation = threadState.topFrame.location();
threadState.pendingMethodExitRequest.addThreadFilter(thread);
threadState.pendingMethodExitRequest.addClassFilter(threadState.stepLocation.declaringType());
@@ -218,6 +228,12 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
// When a breakpoint occurs, abort any pending step requests from the same thread.
if (event instanceof BreakpointEvent || event instanceof ExceptionEvent) {
+ // if we have a pending target step in then ignore and continue.
+ if (threadState.targetStepIn != null) {
+ debugEvent.shouldResume = true;
+ return;
+ }
+
long threadId = ((LocatableEvent) event).thread().uniqueID();
if (threadId == threadState.threadId && threadState.pendingStepRequest != null) {
threadState.deleteStepRequest(eventRequestManager);
@@ -229,20 +245,57 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
}
} else if (event instanceof StepEvent) {
ThreadReference thread = ((StepEvent) event).thread();
+ long threadId = thread.uniqueID();
threadState.deleteStepRequest(eventRequestManager);
- if (isStepFiltersConfigured(context.getStepFilters())) {
+ if (isStepFiltersConfigured(context.getStepFilters()) || threadState.targetStepIn != null) {
try {
- if (threadState.pendingStepType == Command.STEPIN) {
+ if (threadState.pendingStepType == Command.STEPIN || threadState.targetStepIn != null) {
int currentStackDepth = thread.frameCount();
- Location currentStepLocation = getTopFrame(thread).location();
-
- // If the ending step location is filtered, or same as the original location where the step into operation is originated,
- // do another step of the same kind.
- if (shouldFilterLocation(threadState.stepLocation, currentStepLocation, context)
- || shouldDoExtraStepInto(threadState.stackDepth, threadState.stepLocation, currentStackDepth, currentStepLocation)) {
- threadState.pendingStepRequest = DebugUtility.createStepIntoRequest(thread,
- context.getStepFilters().allowClasses,
- context.getStepFilters().skipClasses);
+ StackFrame topFrame = getTopFrame(thread);
+ Location currentStepLocation = topFrame.location();
+ if (threadState.targetStepIn != null) {
+ if (isStoppedAtSelectedMethod(topFrame, threadState.targetStepIn)) {
+ // hit: send StoppedEvent
+ } else {
+ if (currentStackDepth > threadState.stackDepth) {
+ context.getStepResultManager().removeMethodResult(threadId);
+ threadState.pendingStepRequest = DebugUtility.createStepOutRequest(thread,
+ context.getStepFilters().allowClasses,
+ context.getStepFilters().skipClasses);
+ threadState.pendingStepRequest.enable();
+ debugEvent.shouldResume = true;
+ return;
+ } else if (currentStackDepth == threadState.stackDepth) {
+ // If the ending step location is same as the original location where the step into operation is originated,
+ // do another step of the same kind.
+ if (isSameLocation(currentStepLocation, threadState.stepLocation,
+ threadState.targetStepIn)) {
+ context.getStepResultManager().removeMethodResult(threadId);
+ threadState.pendingStepRequest = DebugUtility.createStepIntoRequest(thread,
+ context.getStepFilters().allowClasses,
+ context.getStepFilters().skipClasses);
+ threadState.pendingStepRequest.enable();
+ debugEvent.shouldResume = true;
+ return;
+ }
+ }
+ }
+ } else if (shouldFilterLocation(threadState.stepLocation, currentStepLocation, context)
+ || shouldDoExtraStepInto(threadState.stackDepth, threadState.stepLocation,
+ currentStackDepth, currentStepLocation)) {
+ // If the ending step location is filtered, or same as the original location where the step into operation is originated,
+ // do another step of the same kind.
+ context.getStepResultManager().removeMethodResult(threadId);
+ String[] allowedClasses = context.getStepFilters().allowClasses;
+ if (currentStackDepth > threadState.stackDepth) {
+ threadState.pendingStepRequest = DebugUtility.createStepOutRequest(thread,
+ allowedClasses,
+ context.getStepFilters().skipClasses);
+ } else {
+ threadState.pendingStepRequest = DebugUtility.createStepIntoRequest(thread,
+ allowedClasses,
+ context.getStepFilters().skipClasses);
+ }
threadState.pendingStepRequest.enable();
debugEvent.shouldResume = true;
return;
@@ -256,7 +309,7 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
if (threadState.eventSubscription != null) {
threadState.eventSubscription.dispose();
}
- context.getThreadCache().addEventThread(thread);
+ context.getThreadCache().addEventThread(thread, "step");
context.getProtocolServer().sendEvent(new Events.StoppedEvent("step", thread.uniqueID()));
debugEvent.shouldResume = false;
} else if (event instanceof MethodExitEvent) {
@@ -275,6 +328,56 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
}
}
+ private boolean isStoppedAtSelectedMethod(StackFrame frame, MethodInvocation selectedMethod) {
+ Method method = frame.location().method();
+ if (method != null
+ && Objects.equals(method.name(), selectedMethod.methodName)
+ && (Objects.equals(method.signature(), selectedMethod.methodSignature)
+ || Objects.equals(method.genericSignature(), selectedMethod.methodGenericSignature))) {
+ ObjectReference thisObject = frame.thisObject();
+ ReferenceType currentType = (thisObject == null) ? method.declaringType() : thisObject.referenceType();
+ if ("java.lang.Object".equals(selectedMethod.declaringTypeName)) {
+ return true;
+ }
+
+ return isSubType(currentType, selectedMethod.declaringTypeName);
+ }
+
+ return false;
+ }
+
+ private boolean isSubType(ReferenceType currentType, String baseType) {
+ if (baseType.equals(currentType.name())) {
+ return true;
+ }
+
+ if (currentType instanceof ClassType) {
+ ClassType classType = (ClassType) currentType;
+ ClassType superClassType = classType.superclass();
+ if (superClassType != null && isSubType(superClassType, baseType)) {
+ return true;
+ }
+
+ List interfaces = classType.allInterfaces();
+ for (InterfaceType iface : interfaces) {
+ if (isSubType(iface, baseType)) {
+ return true;
+ }
+ }
+ }
+
+ if (currentType instanceof InterfaceType) {
+ List superInterfaces = ((InterfaceType) currentType).superinterfaces();
+ for (InterfaceType superInterface : superInterfaces) {
+ if (isSubType(superInterface, baseType)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
private boolean isStepFiltersConfigured(StepFilters filters) {
if (filters == null) {
return false;
@@ -305,12 +408,17 @@ private boolean shouldFilterMethod(Method method, IDebugAdapterContext context)
}
/**
- * Check if the current top stack is same as the original top stack.
+ * Check if the current top stack is same as the original top stack and if we
+ * are not in target step in we should not request an extra step in. But if we
+ * are processing a target step in, we only check if the original and current
+ * location are same. If they are not same we request a extra step in.
*
* @throws IncompatibleThreadStateException
- * if the thread is not suspended in the target VM.
+ * if the thread is not suspended in
+ * the target VM.
*/
- private boolean shouldDoExtraStepInto(int originalStackDepth, Location originalLocation, int currentStackDepth, Location currentLocation)
+ private boolean shouldDoExtraStepInto(int originalStackDepth, Location originalLocation, int currentStackDepth,
+ Location currentLocation)
throws IncompatibleThreadStateException {
if (originalStackDepth != currentStackDepth) {
return false;
@@ -318,6 +426,7 @@ private boolean shouldDoExtraStepInto(int originalStackDepth, Location originalL
if (originalLocation == null) {
return false;
}
+
Method originalMethod = originalLocation.method();
Method currentMethod = currentLocation.method();
if (!originalMethod.equals(currentMethod)) {
@@ -326,9 +435,25 @@ private boolean shouldDoExtraStepInto(int originalStackDepth, Location originalL
if (originalLocation.lineNumber() != currentLocation.lineNumber()) {
return false;
}
+
return true;
}
+ private boolean isSameLocation(Location current, Location original, MethodInvocation targetStepIn) {
+ if (original == null || current == null) {
+ return false;
+ }
+
+ Method originalMethod = original.method();
+ Method currentMethod = current.method();
+ // if the lines doesn't match, check if the current line is still behind the
+ // target if a target exist. This handles where the target is part of a
+ // expression which is wrapped.
+ return originalMethod.equals(currentMethod)
+ && (original.lineNumber() == current.lineNumber()
+ || (targetStepIn != null && targetStepIn.lineEnd >= current.lineNumber()));
+ }
+
/**
* Return the top stack frame of the target thread.
*
@@ -353,6 +478,7 @@ class ThreadState {
StackFrame topFrame = null;
Location stepLocation = null;
Disposable eventSubscription = null;
+ MethodInvocation targetStepIn = null;
public void deleteMethodExitRequest(EventRequestManager manager) {
DebugUtility.deleteEventRequestSafely(manager, this.pendingMethodExitRequest);
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java
index 7d404691c..5c4770391 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java
@@ -138,6 +138,7 @@ private CompletableFuture pause(Requests.PauseArguments arguments, Res
context.getStepResultManager().removeAllMethodResults();
context.getDebugSession().suspend();
context.getProtocolServer().sendEvent(new Events.StoppedEvent("pause", arguments.threadId, true));
+ context.getThreadCache().setThreadStoppedReason(arguments.threadId, "pause");
}
return CompletableFuture.completedFuture(response);
}
@@ -148,6 +149,11 @@ private CompletableFuture resume(Requests.ContinueArguments arguments,
if (thread == null) {
thread = DebugUtility.getThread(context.getDebugSession(), arguments.threadId);
}
+
+ if (context.getDebugSession().shouldSuspendAllThreads()) {
+ thread = null;
+ }
+
/**
* See the jdi doc https://docs.oracle.com/javase/7/docs/jdk/api/jpda/jdi/com/sun/jdi/ThreadReference.html#resume(),
* suspends of both the virtual machine and individual threads are counted. Before a thread will run again, it must
@@ -158,12 +164,16 @@ private CompletableFuture resume(Requests.ContinueArguments arguments,
context.getStepResultManager().removeMethodResult(arguments.threadId);
context.getExceptionManager().removeException(arguments.threadId);
allThreadsContinued = false;
+ context.getThreadCache().clearThreadStoppedState(arguments.threadId);
DebugUtility.resumeThread(thread);
+ context.getStackFrameManager().clearStackFrames(thread);
checkThreadRunningAndRecycleIds(thread, context);
} else {
context.getStepResultManager().removeAllMethodResults();
context.getExceptionManager().removeAllExceptions();
+ context.getThreadCache().clearAllThreadStoppedState();
resumeVM(context);
+ context.getStackFrameManager().clearStackFrames();
context.getRecyclableIdPool().removeAllObjects();
}
response.body = new Responses.ContinueResponseBody(allThreadsContinued);
@@ -173,8 +183,10 @@ private CompletableFuture resume(Requests.ContinueArguments arguments,
private CompletableFuture resumeAll(Requests.ThreadOperationArguments arguments, Response response, IDebugAdapterContext context) {
context.getStepResultManager().removeAllMethodResults();
context.getExceptionManager().removeAllExceptions();
+ context.getThreadCache().clearAllThreadStoppedState();
resumeVM(context);
context.getProtocolServer().sendEvent(new Events.ContinuedEvent(arguments.threadId, true));
+ context.getStackFrameManager().clearStackFrames();
context.getRecyclableIdPool().removeAllObjects();
return CompletableFuture.completedFuture(response);
}
@@ -187,6 +199,7 @@ private CompletableFuture resumeOthers(Requests.ThreadOperationArgumen
continue;
}
+ context.getThreadCache().clearThreadStoppedState(thread.uniqueID());
if (context.asyncJDWP()) {
futures.add(AsyncJdwpUtils.runAsync(() -> resumeThread(thread, context)));
} else {
@@ -200,6 +213,7 @@ private CompletableFuture resumeOthers(Requests.ThreadOperationArgumen
private CompletableFuture pauseAll(Requests.ThreadOperationArguments arguments, Response response, IDebugAdapterContext context) {
context.getDebugSession().suspend();
context.getProtocolServer().sendEvent(new Events.StoppedEvent("pause", arguments.threadId, true));
+ context.getThreadCache().setThreadStoppedReason(arguments.threadId, "pause");
return CompletableFuture.completedFuture(response);
}
@@ -280,6 +294,7 @@ private void resumeThread(ThreadReference thread, IDebugAdapterContext context)
context.getExceptionManager().removeException(threadId);
DebugUtility.resumeThread(thread, suspends);
context.getProtocolServer().sendEvent(new Events.ContinuedEvent(threadId));
+ context.getStackFrameManager().clearStackFrames(thread);
checkThreadRunningAndRecycleIds(thread, context);
}
} catch (ObjectCollectedException ex) {
@@ -296,6 +311,7 @@ private void pauseThread(ThreadReference thread, IDebugAdapterContext context) {
context.getStepResultManager().removeMethodResult(threadId);
thread.suspend();
context.getProtocolServer().sendEvent(new Events.StoppedEvent("pause", threadId));
+ context.getThreadCache().setThreadStoppedReason(threadId, "pause");
}
} catch (ObjectCollectedException ex) {
// the thread is garbage collected.
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/StackFrameReference.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/StackFrameReference.java
index 4dc895007..46726cde8 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/StackFrameReference.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/StackFrameReference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Microsoft Corporation and others.
+ * Copyright (c) 2017-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,12 +11,14 @@
package com.microsoft.java.debug.core.adapter.variables;
+import com.microsoft.java.debug.core.protocol.Types.Source;
import com.sun.jdi.ThreadReference;
public class StackFrameReference {
private final int depth;
private final int hash;
private final ThreadReference thread;
+ private Source source;
/**
* Create a wrapper of JDI stackframe to keep the immutable properties of a stackframe, IStackFrameManager will use
@@ -48,6 +50,14 @@ public ThreadReference getThread() {
return thread;
}
+ public Source getSource() {
+ return source;
+ }
+
+ public void setSource(Source source) {
+ this.source = source;
+ }
+
@Override
public int hashCode() {
return hash;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/AbstractProtocolServer.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/AbstractProtocolServer.java
index 9bec3c228..61d57bd85 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/AbstractProtocolServer.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/AbstractProtocolServer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2017 Microsoft Corporation and others.
+* Copyright (c) 2017-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import com.microsoft.java.debug.core.adapter.AdapterUtils;
+import com.microsoft.java.debug.core.adapter.ErrorCode;
import com.microsoft.java.debug.core.protocol.Events.DebugEvent;
import io.reactivex.disposables.Disposable;
@@ -54,6 +56,7 @@ public abstract class AbstractProtocolServer implements IProtocolServer {
private ByteBuffer rawData;
private int contentLength = -1;
private AtomicInteger sequenceNumber = new AtomicInteger(1);
+ private boolean isValidDAPRequest = true;
private PublishSubject responseSubject = PublishSubject.create();
private PublishSubject requestSubject = PublishSubject.create();
@@ -217,7 +220,14 @@ private void processData() {
if (message.type.equals("request")) {
Messages.Request request = JsonUtils.fromJson(messageData, Messages.Request.class);
- requestSubject.onNext(request);
+ if (this.isValidDAPRequest) {
+ requestSubject.onNext(request);
+ } else {
+ Messages.Response response = new Messages.Response(request.seq, request.command);
+ sendResponse(AdapterUtils.setErrorResponse(response,
+ ErrorCode.INVALID_DAP_HEADER,
+ String.format("'%s' request is rejected due to not being a valid DAP message.", request.command)));
+ }
} else if (message.type.equals("response")) {
Messages.Response response = JsonUtils.fromJson(messageData, Messages.Response.class);
responseSubject.onNext(response);
@@ -235,10 +245,20 @@ private void processData() {
if (idx != -1) {
Matcher matcher = CONTENT_LENGTH_MATCHER.matcher(rawMessage);
if (matcher.find()) {
- this.contentLength = Integer.parseInt(matcher.group(1));
- int headerByteLength = rawMessage.substring(0, idx + TWO_CRLF.length())
- .getBytes(PROTOCOL_ENCODING).length;
+ final String contentLengthText = matcher.group(1);
+ this.contentLength = Integer.parseInt(contentLengthText);
+ final String headerMessage = rawMessage.substring(0, idx + TWO_CRLF.length());
+ final int headerByteLength = headerMessage.getBytes(PROTOCOL_ENCODING).length;
this.rawData.removeFirst(headerByteLength); // Remove the header from the raw message.
+
+ int expectedHeaderLength = 16 /*"Content-Length: ".length()*/ + contentLengthText.length();
+ int actualHeaderLength = idx;
+ if (expectedHeaderLength != actualHeaderLength) {
+ this.isValidDAPRequest = false;
+ logger.log(Level.SEVERE, String.format("Illegal DAP request is detected: %s", headerMessage));
+ } else {
+ this.isValidDAPRequest = true;
+ }
continue;
}
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Events.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Events.java
index 681ec543d..e692e9b8d 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Events.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Events.java
@@ -38,6 +38,11 @@ public static class StoppedEvent extends DebugEvent {
public String description;
public String text;
public boolean allThreadsStopped;
+ /**
+ * A value of true hints to the client that this event should not change the
+ * focus.
+ */
+ public Boolean preserveFocusHint;
/**
* Constructor.
@@ -246,6 +251,30 @@ public UserNotificationEvent(NotificationType notifyType, String message) {
}
}
+ public static class TelemetryEvent extends DebugEvent {
+ /**
+ * The telemetry event name.
+ */
+ public String name;
+
+ /**
+ * The properties is an object as below.
+ * {
+ * [key: string]: string | number;
+ * }
+ */
+ public Object properties;
+
+ /**
+ * Constructor.
+ */
+ public TelemetryEvent(String name, Object data) {
+ super("telemetry");
+ this.name = name;
+ this.properties = data;
+ }
+ }
+
public static enum InvalidatedAreas {
@SerializedName("all")
ALL,
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java
index 0301bdb38..1129d230e 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java
@@ -67,6 +67,15 @@ public static class ClassFilters {
public String[] skipClasses = new String[0];
}
+ public static class ExceptionFilters extends ClassFilters {
+ /**
+ * Specifies that exceptions which are instances of refType will be reported.
+ * Note: this will include instances of sub-types. If null, all instances
+ * will be reported.
+ */
+ public String[] exceptionTypes = new String[0];
+ }
+
public static class StepFilters extends ClassFilters {
/**
* Deprecated - please use {@link ClassFilters#skipClasses } instead.
@@ -271,6 +280,10 @@ public static class StepOutArguments extends StepArguments {
}
+ public static class StepInTargetsArguments extends Arguments {
+ public int frameId;
+ }
+
public static class PauseArguments extends Arguments {
public long threadId;
}
@@ -413,6 +426,15 @@ public static class BreakpointLocationsArguments extends Arguments {
public int endColumn;
}
+ public static class RefreshFramesArguments extends Arguments {
+ /**
+ * If provided, refresh the stack frames of the paused threads that previously
+ * requested decompiled sources for classes in the affected root paths.
+ * Otherwise, refresh all paused threads.
+ */
+ public String[] affectedRootPaths;
+ }
+
public static enum Command {
INITIALIZE("initialize", InitializeArguments.class),
LAUNCH("launch", LaunchArguments.class),
@@ -423,6 +445,8 @@ public static enum Command {
CONTINUE("continue", ContinueArguments.class),
STEPIN("stepIn", StepInArguments.class),
STEPOUT("stepOut", StepOutArguments.class),
+ STEPIN_TARGETS("stepInTargets",
+ StepInTargetsArguments.class),
PAUSE("pause", PauseArguments.class),
STACKTRACE("stackTrace", StackTraceArguments.class),
RESTARTFRAME("restartFrame", RestartFrameArguments.class),
@@ -449,6 +473,7 @@ public static enum Command {
REFRESHVARIABLES("refreshVariables", RefreshVariablesArguments.class),
PROCESSID("processId", Arguments.class),
BREAKPOINTLOCATIONS("breakpointLocations", BreakpointLocationsArguments.class),
+ REFRESHFRAMES("refreshFrames", RefreshFramesArguments.class),
UNSUPPORTED("", Arguments.class);
private String command;
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Responses.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Responses.java
index ea660f812..af701552e 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Responses.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Responses.java
@@ -17,6 +17,7 @@
import com.microsoft.java.debug.core.protocol.Types.DataBreakpointAccessType;
import com.microsoft.java.debug.core.protocol.Types.ExceptionBreakMode;
import com.microsoft.java.debug.core.protocol.Types.ExceptionDetails;
+import com.microsoft.java.debug.core.protocol.Types.StepInTarget;
import com.microsoft.java.debug.core.protocol.Types.Variable;
/**
@@ -364,4 +365,12 @@ public InlineValuesResponse(Variable[] variables) {
this.variables = variables;
}
}
+
+ public static class StepInTargetsResponse extends ResponseBody {
+ public StepInTarget[] targets;
+
+ public StepInTargetsResponse(StepInTarget[] targets) {
+ this.targets = targets;
+ }
+ }
}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Types.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Types.java
index 4781c7a57..33308af6d 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Types.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Types.java
@@ -433,5 +433,21 @@ public static class Capabilities {
public boolean supportsFunctionBreakpoints;
// https://microsoft.github.io/debug-adapter-protocol/specification#Requests_BreakpointLocations
public boolean supportsBreakpointLocationsRequest;
+ public boolean supportsStepInTargetsRequest;
}
+
+ public static class StepInTarget {
+ public int id;
+ public String label;
+ public int line;
+ public int column;
+ public int endLine;
+ public int endColumn;
+
+ public StepInTarget(int id, String label) {
+ this.id = id;
+ this.label = label;
+ }
+ }
+
}
diff --git a/com.microsoft.java.debug.core/src/test/java/com/microsoft/java/debug/core/BreakpointTest.java b/com.microsoft.java.debug.core/src/test/java/com/microsoft/java/debug/core/BreakpointTest.java
new file mode 100644
index 000000000..5cc6fa3d7
--- /dev/null
+++ b/com.microsoft.java.debug.core/src/test/java/com/microsoft/java/debug/core/BreakpointTest.java
@@ -0,0 +1,17 @@
+package com.microsoft.java.debug.core;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BreakpointTest {
+ @Test
+ public void testToNoneGeneric() {
+ assertEquals("Ljava.util.List;", Breakpoint.toNoneGeneric("Ljava.util.List;"));
+ assertEquals("(Ljava/util/Map;)Ljava/util/Map;", Breakpoint.toNoneGeneric(
+ "(Ljava/util/Map;>;)Ljava/util/Map;>;"));
+ assertEquals("(Ljava/util/Map;)Ljava/util/Map;",
+ Breakpoint.toNoneGeneric(
+ "(Ljava/util/Map;Ljava/util/List;>;)Ljava/util/Map;Ljava/util/List;>;"));
+ }
+}
diff --git a/com.microsoft.java.debug.plugin/.classpath b/com.microsoft.java.debug.plugin/.classpath
index b7e330e32..b2be945c8 100644
--- a/com.microsoft.java.debug.plugin/.classpath
+++ b/com.microsoft.java.debug.plugin/.classpath
@@ -1,16 +1,16 @@
-
+
-
+
-
+
diff --git a/com.microsoft.java.debug.plugin/.project b/com.microsoft.java.debug.plugin/.project
index 72ba17ff7..529a656dd 100644
--- a/com.microsoft.java.debug.plugin/.project
+++ b/com.microsoft.java.debug.plugin/.project
@@ -39,12 +39,12 @@
- 1599036548577
+ 1665543654719
30
org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
+ node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
diff --git a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
index 9667f9e51..f2ceffb53 100644
--- a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
+++ b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ 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.40.0
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-Version: 0.53.2
+Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
Bundle-Vendor: Microsoft
@@ -21,8 +21,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.lang3,
org.eclipse.lsp4j,
com.google.guava
-Bundle-ClassPath: lib/commons-io-2.11.0.jar,
+Bundle-ClassPath: lib/commons-io-2.19.0.jar,
.,
lib/rxjava-2.2.21.jar,
lib/reactive-streams-1.0.4.jar,
- lib/com.microsoft.java.debug.core-0.40.0.jar
+ lib/com.microsoft.java.debug.core-0.53.2.jar
diff --git a/com.microsoft.java.debug.plugin/pom.xml b/com.microsoft.java.debug.plugin/pom.xml
index 56bb813e6..2e2c0e6a8 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.40.0
+ 0.53.2
com.microsoft.java.debug.plugin
eclipse-plugin
@@ -51,12 +51,12 @@
commons-io
commons-io
- 2.11.0
+ 2.19.0
com.microsoft.java
com.microsoft.java.debug.core
- 0.40.0
+ 0.53.2
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BindingUtils.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BindingUtils.java
new file mode 100644
index 000000000..085bf0d4c
--- /dev/null
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BindingUtils.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2017-2022 Microsoft Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Microsoft Corporation - initial API and implementation
+*******************************************************************************/
+
+package com.microsoft.java.debug;
+
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.internal.debug.core.breakpoints.LambdaLocationLocatorHelper;
+
+/**
+ * Utility methods around working with JDT Bindings.
+ */
+@SuppressWarnings("restriction")
+public final class BindingUtils {
+ private BindingUtils() {
+
+ }
+
+ /**
+ * Return the method name from the binding using either the
+ * {@link IMethodBinding#getKey()} or {@link IMethodBinding#getName()}. The key
+ * can be used to find the name of a generated lambda method if the minding
+ * represents a lambda method.
+ *
+ * @param binding the binding to extract the name from.
+ * @param fromKey use binging key to resolve the method name.
+ * @return the name of the method.
+ */
+ public static String getMethodName(IMethodBinding binding, boolean fromKey) {
+ if (fromKey) {
+ String key = binding.getKey();
+ int dotAt = key.indexOf('.');
+ int end = key.indexOf('<', dotAt);
+ if (end == -1) {
+ end = key.indexOf('(');
+ } else {
+ end = Math.min(end, key.indexOf('('));
+ }
+ return key.substring(dotAt + 1, end);
+ } else {
+ return binding.getName();
+ }
+ }
+
+ /**
+ * Returns the method signature of the method represented by the binding
+ * including the synthetic outer locals.
+ *
+ * @param binding the binding which the signature must be resolved for.
+ * @return the signature or null if the signature could not be resolved.
+ */
+ public static String toSignature(IMethodBinding binding) {
+ return LambdaLocationLocatorHelper.toMethodSignature(binding);
+ }
+
+}
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BreakpointLocationLocator.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BreakpointLocationLocator.java
index 00cffb766..97581242e 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BreakpointLocationLocator.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/BreakpointLocationLocator.java
@@ -22,8 +22,8 @@ public class BreakpointLocationLocator
public BreakpointLocationLocator(CompilationUnit compilationUnit, int lineNumber,
boolean bindingsResolved,
- boolean bestMatch) {
- super(compilationUnit, lineNumber, bindingsResolved, bestMatch);
+ boolean bestMatch, int offset, int end) {
+ super(compilationUnit, lineNumber, bindingsResolved, bestMatch, offset, end);
}
@Override
@@ -46,7 +46,7 @@ public String getMethodSignature() {
if (this.methodBinding == null) {
return null;
}
- return toSignature(this.methodBinding, getMethodName());
+ return BindingUtils.toSignature(this.methodBinding);
}
/**
@@ -70,22 +70,4 @@ public String getFullyQualifiedTypeName() {
}
return super.getFullyQualifiedTypeName();
}
-
- static String toSignature(IMethodBinding binding, String name) {
- // use key for now until JDT core provides a public API for this.
- // "Ljava/util/Arrays;.asList([TT;)Ljava/util/List;"
- // "([Ljava/lang/String;)V|Ljava/lang/InterruptedException;"
- String signatureString = binding.getKey();
- if (signatureString != null) {
- int index = signatureString.indexOf(name);
- if (index > -1) {
- int exceptionIndex = signatureString.indexOf("|", signatureString.lastIndexOf(")"));
- if (exceptionIndex > -1) {
- return signatureString.substring(index + name.length(), exceptionIndex);
- }
- return signatureString.substring(index + name.length());
- }
- }
- return null;
- }
}
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java
index b37ff7b1f..a5456809a 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/LambdaExpressionLocator.java
@@ -71,7 +71,7 @@ public String getMethodSignature() {
if (!this.found) {
return null;
}
- return BreakpointLocationLocator.toSignature(this.lambdaMethodBinding, getMethodName());
+ return BindingUtils.toSignature(this.lambdaMethodBinding);
}
/**
@@ -81,8 +81,7 @@ public String getMethodName() {
if (!this.found) {
return null;
}
- String key = this.lambdaMethodBinding.getKey();
- return key.substring(key.indexOf('.') + 1, key.indexOf('('));
+ return BindingUtils.getMethodName(lambdaMethodBinding, true);
}
/**
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/AdvancedLaunchingConnector.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/AdvancedLaunchingConnector.java
index 3551ab2e6..24c65785d 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/AdvancedLaunchingConnector.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/AdvancedLaunchingConnector.java
@@ -195,7 +195,6 @@ private static String[] constructLaunchCommand(Map l
StringBuilder execString = new StringBuilder();
execString.append("\"" + javaHome + slash + "bin" + slash + javaExec + "\"");
- execString.append(" -Xdebug -Xnoagent -Djava.compiler=NONE");
execString.append(" -Xrunjdwp:transport=dt_socket,address=" + address + ",server=n,suspend=" + (suspend ? "y" : "n"));
if (javaOptions != null) {
execString.append(" " + javaOptions);
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/Compile.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/Compile.java
new file mode 100644
index 000000000..245281816
--- /dev/null
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/Compile.java
@@ -0,0 +1,190 @@
+/*******************************************************************************
+ * Copyright (c) 2022 Microsoft Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Microsoft Corporation - initial API and implementation
+ *******************************************************************************/
+
+package com.microsoft.java.debug.plugin.internal;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.core.resources.IBuildConfiguration;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.ls.core.internal.BuildWorkspaceStatus;
+import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ls.core.internal.ProjectUtils;
+import org.eclipse.jdt.ls.core.internal.ResourceUtils;
+import org.eclipse.jdt.ls.core.internal.handlers.BuildWorkspaceHandler;
+import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;
+import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.eclipse.lsp4j.extended.ProjectBuildParams;
+
+import com.microsoft.java.debug.core.Configuration;
+
+public class Compile {
+ private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
+
+ private static final int GRADLE_BS_COMPILATION_ERROR = 100;
+
+ public static Object compile(CompileParams params, IProgressMonitor monitor) {
+ if (params == null) {
+ throw new IllegalArgumentException("The compile parameters should not be null.");
+ }
+
+ IProject mainProject = JdtUtils.getMainProject(params.getProjectName(), params.getMainClass());
+ if (JdtUtils.isBspProject(mainProject) && !ProjectUtils.isGradleProject(mainProject)) {
+ // Just need to trigger a build for the target project, the Gradle build server will
+ // handle the build dependencies for us.
+ try {
+ ResourcesPlugin.getWorkspace().build(
+ new IBuildConfiguration[]{mainProject.getActiveBuildConfig()},
+ IncrementalProjectBuilder.INCREMENTAL_BUILD,
+ false /*buildReference*/,
+ monitor
+ );
+ } catch (CoreException e) {
+ if (e.getStatus().getCode() == IResourceStatus.BUILD_FAILED) {
+ return GRADLE_BS_COMPILATION_ERROR;
+ } else {
+ return BuildWorkspaceStatus.FAILED;
+ }
+ }
+ return BuildWorkspaceStatus.SUCCEED;
+ }
+
+ if (monitor.isCanceled()) {
+ return BuildWorkspaceStatus.CANCELLED;
+ }
+
+ ProjectBuildParams buildParams = new ProjectBuildParams();
+ List identifiers = new LinkedList<>();
+ buildParams.setFullBuild(params.isFullBuild);
+ for (IJavaProject javaProject : ProjectUtils.getJavaProjects()) {
+ if (ProjectsManager.getDefaultProject().equals(javaProject.getProject())) {
+ continue;
+ }
+ // we only build project which is not a BSP project, in case that the compile request is triggered by
+ // HCR with auto-build disabled, the build for BSP projects will be triggered by JavaHotCodeReplaceProvider.
+ if (!JdtUtils.isBspProject(javaProject.getProject())) {
+ identifiers.add(new TextDocumentIdentifier(javaProject.getProject().getLocationURI().toString()));
+ }
+ }
+ if (identifiers.size() == 0) {
+ return BuildWorkspaceStatus.SUCCEED;
+ }
+
+ buildParams.setIdentifiers(identifiers);
+ long compileAt = System.currentTimeMillis();
+ BuildWorkspaceHandler buildWorkspaceHandler = new BuildWorkspaceHandler(JavaLanguageServerPlugin.getProjectsManager());
+ BuildWorkspaceStatus status = buildWorkspaceHandler.buildProjects(buildParams, monitor);
+ logger.info("Time cost for ECJ: " + (System.currentTimeMillis() - compileAt) + "ms");
+ if (status == BuildWorkspaceStatus.FAILED || status == BuildWorkspaceStatus.CANCELLED) {
+ return status;
+ }
+
+ try {
+ IResource currentResource = mainProject;
+ if (isUnmanagedFolder(mainProject) && StringUtils.isNotBlank(params.getMainClass())) {
+ IType mainType = ProjectUtils.getJavaProject(mainProject).findType(params.getMainClass());
+ if (mainType != null && mainType.getResource() != null) {
+ currentResource = mainType.getResource();
+ }
+ }
+
+ List problemMarkers = new ArrayList<>();
+ if (currentResource != null) {
+ List markers = ResourceUtils.getErrorMarkers(currentResource);
+ if (markers != null) {
+ problemMarkers.addAll(markers);
+ }
+
+ // Check if the referenced projects contain compilation errors.
+ if (currentResource instanceof IProject && ProjectUtils.isJavaProject((IProject) currentResource)) {
+ IJavaProject currentJavaProject = ProjectUtils.getJavaProject((IProject) currentResource);
+ IJavaProject[] javaProjects = ProjectUtils.getJavaProjects();
+ for (IJavaProject otherJavaProject : javaProjects) {
+ IProject other = otherJavaProject.getProject();
+ if (!other.equals(getDefaultProject()) && !other.equals((IProject) currentResource)
+ && currentJavaProject.isOnClasspath(otherJavaProject)) {
+ markers = ResourceUtils.getErrorMarkers(other);
+ if (markers != null) {
+ problemMarkers.addAll(markers);
+ }
+ }
+ }
+ }
+ } else {
+ IJavaProject[] javaProjects = ProjectUtils.getJavaProjects();
+ for (IJavaProject javaProject : javaProjects) {
+ IProject project = javaProject.getProject();
+ if (!project.equals(getDefaultProject())) {
+ List markers = ResourceUtils.getErrorMarkers(project);
+ if (markers != null) {
+ problemMarkers.addAll(markers);
+ }
+ }
+ }
+ }
+
+ if (!problemMarkers.isEmpty()) {
+ return BuildWorkspaceStatus.WITH_ERROR;
+ }
+ } catch (CoreException e) {
+ JavaLanguageServerPlugin.log(e);
+ }
+
+ return BuildWorkspaceStatus.SUCCEED;
+ }
+
+ private static boolean isUnmanagedFolder(IProject project) {
+ return project != null && ProjectUtils.isUnmanagedFolder(project)
+ && ProjectUtils.isJavaProject(project);
+ }
+
+ private static IProject getDefaultProject() {
+ return getWorkspaceRoot().getProject(ProjectsManager.DEFAULT_PROJECT_NAME);
+ }
+
+ private static IWorkspaceRoot getWorkspaceRoot() {
+ return ResourcesPlugin.getWorkspace().getRoot();
+ }
+
+ class CompileParams {
+ String projectName;
+ String mainClass;
+ boolean isFullBuild = false;
+
+ public String getMainClass() {
+ return mainClass;
+ }
+
+ public boolean isFullBuild() {
+ return isFullBuild;
+ }
+
+ public String getProjectName() {
+ return projectName;
+ }
+ }
+}
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 be7932992..431c283f5 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
@@ -28,6 +28,7 @@
import org.eclipse.jdt.core.CompletionContext;
import org.eclipse.jdt.core.CompletionProposal;
import org.eclipse.jdt.core.CompletionRequestor;
+import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaElement;
@@ -45,6 +46,7 @@
import org.eclipse.jdt.ls.core.internal.handlers.CompletionResponses;
import org.eclipse.lsp4j.CompletionItem;
import org.eclipse.lsp4j.CompletionItemKind;
+import org.eclipse.lsp4j.CompletionItemLabelDetails;
import com.google.common.collect.ImmutableSet;
import com.microsoft.java.debug.core.Configuration;
@@ -70,6 +72,8 @@ public final class CompletionProposalRequestor extends CompletionRequestor {
CompletionItemKind.Text);
// @formatter:on
+ private static boolean isFilterFailed = false;
+
/**
* Constructor.
* @param typeRoot ITypeRoot
@@ -153,19 +157,40 @@ public List getCompletionItems() {
*/
public CompletionItem toCompletionItem(CompletionProposal proposal, int index) {
final CompletionItem $ = new CompletionItem();
- $.setKind(mapKind(proposal.getKind()));
+ $.setKind(mapKind(proposal.getKind(), proposal.getFlags()));
Map data = new HashMap<>();
data.put(CompletionResolveHandler.DATA_FIELD_REQUEST_ID, String.valueOf(response.getId()));
data.put(CompletionResolveHandler.DATA_FIELD_PROPOSAL_ID, String.valueOf(index));
$.setData(data);
this.descriptionProvider.updateDescription(proposal, $);
+ // Use fully qualified name as needed.
+ $.setInsertText(String.valueOf(proposal.getCompletion()));
adjustCompleteItem($);
$.setSortText(SortTextHelper.computeSortText(proposal));
return $;
}
private void adjustCompleteItem(CompletionItem item) {
- if (item.getKind() == CompletionItemKind.Function) {
+ CompletionItemKind itemKind = item.getKind();
+ if (itemKind == CompletionItemKind.Class || itemKind == CompletionItemKind.Interface
+ || itemKind == CompletionItemKind.Enum) {
+ // Display the package name in the label property.
+ CompletionItemLabelDetails labelDetails = item.getLabelDetails();
+ if (labelDetails != null && StringUtils.isNotBlank(labelDetails.getDescription())) {
+ item.setLabel(item.getLabel() + " - " + labelDetails.getDescription());
+ }
+ } else if (itemKind == CompletionItemKind.Function) {
+ // Merge the label details into the label property
+ // because the completion provider in DEBUG CONSOLE
+ // doesn't support the label details.
+ CompletionItemLabelDetails labelDetails = item.getLabelDetails();
+ if (labelDetails != null && StringUtils.isNotBlank(labelDetails.getDetail())) {
+ item.setLabel(item.getLabel() + labelDetails.getDetail());
+ }
+ if (labelDetails != null && StringUtils.isNotBlank(labelDetails.getDescription())) {
+ item.setLabel(item.getLabel() + " : " + labelDetails.getDescription());
+ }
+
String text = item.getInsertText();
if (StringUtils.isNotBlank(text) && !text.endsWith(")")) {
item.setInsertText(text + "()");
@@ -181,7 +206,7 @@ public void acceptContext(CompletionContext context) {
this.descriptionProvider = new CompletionProposalDescriptionProvider(context);
}
- private CompletionItemKind mapKind(final int kind) {
+ private CompletionItemKind mapKind(final int kind, final int flags) {
// When a new CompletionItemKind is added, don't forget to update
// SUPPORTED_KINDS
switch (kind) {
@@ -190,6 +215,11 @@ private CompletionItemKind mapKind(final int kind) {
return CompletionItemKind.Constructor;
case CompletionProposal.ANONYMOUS_CLASS_DECLARATION:
case CompletionProposal.TYPE_REF:
+ if (Flags.isInterface(flags)) {
+ return CompletionItemKind.Interface;
+ } else if (Flags.isEnum(flags)) {
+ return CompletionItemKind.Enum;
+ }
return CompletionItemKind.Class;
case CompletionProposal.FIELD_IMPORT:
case CompletionProposal.METHOD_IMPORT:
@@ -199,6 +229,9 @@ private CompletionItemKind mapKind(final int kind) {
return CompletionItemKind.Module;
case CompletionProposal.FIELD_REF:
case CompletionProposal.FIELD_REF_WITH_CASTED_RECEIVER:
+ if (Flags.isStatic(flags) && Flags.isFinal(flags)) {
+ return CompletionItemKind.Constant;
+ }
return CompletionItemKind.Field;
case CompletionProposal.KEYWORD:
return CompletionItemKind.Keyword;
@@ -290,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
}
@@ -301,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.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/InlineValueHandler.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/InlineValueHandler.java
index 5c2cf8834..15aeeb2b4 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/InlineValueHandler.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/InlineValueHandler.java
@@ -166,7 +166,7 @@ private static IMethod findMethodInLocalTypes(IMethod enclosingMethod, int stopp
*/
private static Position getPosition(IBuffer buffer, int offset) {
int[] result = JsonRpcHelpers.toLine(buffer, offset);
- if (result == null && result.length < 1) {
+ if (result == null || result.length < 1) {
return new Position(-1, -1);
}
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JavaDebugDelegateCommandHandler.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JavaDebugDelegateCommandHandler.java
index 1875d514e..f4e7b0ba3 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JavaDebugDelegateCommandHandler.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JavaDebugDelegateCommandHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2017-2019 Microsoft Corporation and others.
+* Copyright (c) 2017-2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,8 +64,12 @@ public Object executeCommand(String commandId, List