From cae228480ce45c3f214fd637d8e9761898a2a30c Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 3 Aug 2022 11:46:34 -0400 Subject: [PATCH] Rename default branch to 'main'. Signed-off-by: Roland Grunberg --- .github/scripts/check_and_update_jdk.py | 2 +- .github/workflows/conflictDetector.yaml | 4 ++-- CONTRIBUTING.md | 2 +- README.md | 8 ++++---- src/typeHierarchy/model.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/scripts/check_and_update_jdk.py b/.github/scripts/check_and_update_jdk.py index ff6671859c..a297dc1cde 100644 --- a/.github/scripts/check_and_update_jdk.py +++ b/.github/scripts/check_and_update_jdk.py @@ -30,7 +30,7 @@ if latest_jdk != current_jdk: print(f'New JDK version detected: {latest_jdk}') # Create a formatted string template from the URI structure - uri_base = 'https://ci.eclipse.org/ls/job/jdt-ls-master/lastCompletedBuild/testReport/org.eclipse.jdt.ls.core.internal.{package}/{java_class}/{method}/api/python' + uri_base = 'https://ci.eclipse.org/ls/job/jdt-ls-main/lastCompletedBuild/testReport/org.eclipse.jdt.ls.core.internal.{package}/{java_class}/{method}/api/python' # Define the test URLs to check using the template and list comprehension tests = [ uri_base.format(package='managers', java_class=c, method=m) for c, m in [('EclipseProjectImporterTest', 'testPreviewFeaturesDisabledByDefault'), ('InvisibleProjectImporterTest', 'testPreviewFeaturesEnabledByDefault'), ('MavenProjectImporterTest', f'testJava{latest_jdk}Project')] diff --git a/.github/workflows/conflictDetector.yaml b/.github/workflows/conflictDetector.yaml index 54df14e058..15a95fd885 100644 --- a/.github/workflows/conflictDetector.yaml +++ b/.github/workflows/conflictDetector.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main jobs: triage: runs-on: ubuntu-latest @@ -9,4 +9,4 @@ jobs: - uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c with: CONFLICT_LABEL_NAME: "has conflicts" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 29ab311c93..9a5782c9d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -198,7 +198,7 @@ You can create a binary that you can sideload to your VS Code installation. $ npm install ``` 4. Optionally, follow the instruction to build the server. -5. See documentation on [extension installation](https://github.com/microsoft/vscode-docs/blob/master/api/working-with-extensions/publishing-extension.md) +5. See documentation on [extension installation](https://github.com/microsoft/vscode-docs/blob/main/api/working-with-extensions/publishing-extension.md) on ways to sideload or share. # Reporting issues diff --git a/README.md b/README.md index f3b2c6fa82..62a167dab7 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Language support for Java ™ for Visual Studio Code [![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/v/redhat.java?style=for-the-badge&label=VS%20Marketplace&logo=visual-studio-code)](https://marketplace.visualstudio.com/items?itemName=redhat.java) [![Installs](https://img.shields.io/visual-studio-marketplace/i/redhat.java?style=for-the-badge)](https://marketplace.visualstudio.com/items?itemName=redhat.java) [![Join the chat at https://gitter.im/redhat-developer/vscode-java](https://img.shields.io/gitter/room/redhat-developer/vscode-java?style=for-the-badge&logo=gitter)](https://gitter.im/redhat-developer/vscode-java) -[![Build Status](https://img.shields.io/github/actions/workflow/status/redhat-developer/vscode-java/pr-verify.yml?branch=master&style=for-the-badge&logo=github)](https://github.com/redhat-developer/vscode-java/actions?query=workflow:pr-verify) -[![License](https://img.shields.io/github/license/redhat-developer/vscode-java?style=for-the-badge&logo=eclipse)](https://github.com/redhat-developer/vscode-java/blob/master/LICENSE) +[![Build Status](https://img.shields.io/github/actions/workflow/status/redhat-developer/vscode-java/pr-verify.yml?branch=main&style=for-the-badge&logo=github)](https://github.com/redhat-developer/vscode-java/actions?query=workflow:pr-verify) +[![License](https://img.shields.io/github/license/redhat-developer/vscode-java?style=for-the-badge&logo=eclipse)](https://github.com/redhat-developer/vscode-java/blob/main/LICENSE) Provides Java ™ language support via [Eclipse ™ JDT Language Server](https://github.com/eclipse/eclipse.jdt.ls), which utilizes @@ -22,7 +22,7 @@ If on another platform, or using the "universal" version, you can [set](#setting Features ========= -![ screencast ](https://raw.githubusercontent.com/redhat-developer/vscode-java/master/images/vscode-java.0.0.1.gif) +![ screencast ](https://raw.githubusercontent.com/redhat-developer/vscode-java/main/images/vscode-java.0.0.1.gif) * Supports code from Java 1.8 to Java 24 * Maven pom.xml project support @@ -267,7 +267,7 @@ Troubleshooting It should show ready (thumbs up) as on the image below. You can click on the status and open the language tool logs for further information in case of a failure. -![ status indicator ](https://raw.githubusercontent.com/redhat-developer/vscode-java/master/images/statusMarker.png) +![ status indicator ](https://raw.githubusercontent.com/redhat-developer/vscode-java/main/images/statusMarker.png) 2. Read the [troubleshooting guide](https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting) for collecting informations about issues you might encounter. diff --git a/src/typeHierarchy/model.ts b/src/typeHierarchy/model.ts index 089fc130e4..2be7037979 100644 --- a/src/typeHierarchy/model.ts +++ b/src/typeHierarchy/model.ts @@ -194,7 +194,7 @@ class TypeHierarchyTreeDataProvider implements vscode.TreeDataProvider