Skip to content

Merge changes from branch 26.0.1 to main#618

Merged
sid-srini merged 13 commits into
mainfrom
26.0.1
Jun 25, 2026
Merged

Merge changes from branch 26.0.1 to main#618
sid-srini merged 13 commits into
mainfrom
26.0.1

Conversation

@sid-srini

Copy link
Copy Markdown
Member

No description provided.

Achal1607 and others added 13 commits April 21, 2026 15:08
Fixed ordering of commands in the explorer window
Relaxed version check on the notebook format
New setting ID typo fix: jdk.format.settings -> jdk.format.options
Fixed the new ID in the deprecationMessage for jdk.format.settingsPath
LSP server - Package creation and detect duplicate class file name
Fixed handler.ts:jdkHomeValueHandler() to have the promise return the
fallback env vars JDK_HOME or JAVA_HOME when no config value is defined.
- The config getter returns the default value i.e. null, in such a case.
- Thus, the defaultValue parameter cannot be used, since the vscode
  config getter returns the default value defined in package.json,
  causing the value to not be `undefined`.
- So, a `then()` clause on the promise is needed to check for `null` or
  `undefined` value, and fallback to the env vars, if so.
…er-fallback

Fixed jdkHome config value handler fallback to env vars
Backports netbeans PR 9369.
- Added checks for null and required JsonElement type in the
  registered config change listeners in WorkspaceService.
- Included a check for blank input defaultPlatformOverride in
  AbstractJavaPlatformProviderOverride to avoid expensive
  initialization in such cases.

This fixes issues like "IOException: Invalid J2SE platform" when
`jdk.project.jdkhome` is set to `""` in settings.json.
…ll-check

Added basic type checks in java.lsp.server config change listeners
@sid-srini sid-srini requested a review from Achal1607 June 25, 2026 17:31
@oracle-contributor-agreement oracle-contributor-agreement Bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jun 25, 2026

@Achal1607 Achal1607 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @sid-srini

@sid-srini sid-srini merged commit abaebde into main Jun 25, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

OCA Verified All contributors have signed the Oracle Contributor Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants