Skip to content

Sync testing branch with main #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Aug 16, 2024
Merged

Sync testing branch with main #240

merged 19 commits into from
Aug 16, 2024

Conversation

Achal1607
Copy link
Member

No description provided.

Achal1607 and others added 19 commits July 23, 2024 13:00
…lorer panel for non-workspace opened Java files

Fixed runConfiguration.ts: `initializeRunConfiguration()` to search for java files in open editors when no workspace is open.

1. Checked for non-workspace opened files by testing the validity of `vscode.workspace.name` AND `vscode.workspace.workspaceFile`.
2. Searched for java extension file names in `vscode.workspace.textDocuments` when no workspace is open.
3. Fixed `RunConfigurationNode.setValue()` to invoke `WorkspaceConfiguration.update()` with `configurationTarget =` :
    - `true`: when no workspace is open i.e. user global target;
    - `null`: otherwise i.e. workspace target.

Fixes #196

Signed-off-by: Siddharth Srinivasan <[email protected]>
Upgrade node-jsonc-parser library
* pre-commit hook to check internal artifactory url

* updated regex

* updated regex
[JAVAVSCODE #196] Run Configuration section is unavailable in the Explorer panel for non-workspace opened Java files
* Upgrade Gradle tooling to Support JDK-22

* updated build.xml

* added one more patch to support upgrade of gradle
…ons in global settings for non-workspace opened Java files (#211)

Fixed extension.ts `UpdateConfigurationRequest` handler to update the global `WorkspaceConfiguration` for non-workspace opened files.

1. Checked for non-workspace opened files by testing if `vscode.workspace.workspaceFile` is undefined/null.
2. Invoked `WorkspaceConfiguration.update()` with `configurationTarget = `:
    - `true`: for non-workspace files;
    - `null`: otherwise.
3. Added a try-catch to log errors in update and prevent downstream failures.
4. Avoided an unnecessary `await` and used the `Thenable` chain of `update()`.

Fixes #199

Signed-off-by: Siddharth Srinivasan <[email protected]>
* backporting NetBeans 23 fixes

* updated patch name

* updated 7548 patch
1. Placed patch files in separate lines to ease merges and reduce conflicts.

2. Added string parsing and trimming of the patches list to allow for placing patch files in separate lines.
    - Also added a check for empty patch list when applying or unapplying the patches.

3. Added a "clean-netbeans" target, similar to the "build-netbeans" target, to help in cleaning just the netbeans build artifacts.

Signed-off-by: Siddharth Srinivasan <[email protected]>
Ant build script reorganization for patches and clean-netbeans
* Updated README added  Enabling Java preview features section
* [JVSC #199] Backport NetBeans 24 patch 7610

Backporting the NetBeans 24 patch [#7610](apache/netbeans#7610) and
adding it to the patches list in build.xml.

- This brings the fix for getting config options for a single source file to the NB 22 branch.
- This allows the fix for #199 to demonstrate its effect.

Signed-off-by: Siddharth Srinivasan <[email protected]>

* Update build.xml with ascending numeric order of PR patches

Signed-off-by: Siddharth Srinivasan <[email protected]>

---------

Signed-off-by: Siddharth Srinivasan <[email protected]>
Signed-off-by: Subhash Arabhi <[email protected]>
Co-authored-by: Siddharth Srinivasan <[email protected]>
@Achal1607 Achal1607 requested a review from sid-srini August 16, 2024 06:56
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Aug 16, 2024
@sid-srini sid-srini merged commit ccea9c6 into testing Aug 16, 2024
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.

6 participants