Skip to content

Merging feature branch - 23.0.0 into main #275

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 30 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6310a3b
Support to set Project level JDK (#244)
Achal1607 Aug 26, 2024
e4b4427
Backport NB23 patch 7390 to fix the Exception template (#247)
sid-srini Aug 27, 2024
fe811d4
Backport NB patch for Gradle tooling 8.10 upgrade
sid-srini Sep 5, 2024
f8979a6
Fix for delete cache error on windows (#245)
shivam71 Sep 5, 2024
2f9b2f4
Merge pull request #257 from sid-srini/update_gradle_for_jdk23
sid-srini Sep 6, 2024
7c8df21
Initial sketch of NB-23 upgrade
Achal1607 Sep 3, 2024
b124094
[JAVSCODE-253] localisation support - adding japanese and simplified…
naren2605 Sep 6, 2024
a6ce838
Merge pull request #256 from Achal1607/nb-23-upgrade
sid-srini Sep 6, 2024
56cf2d8
Restrict parent directory traversal for finding the associated projec…
sid-srini Sep 6, 2024
d238cde
Revert "Merge pull request #256 from Achal1607/nb-23-upgrade" (#260)
sid-srini Sep 9, 2024
c4a49dd
Refactored JDK Downloader
Achal1607 Aug 28, 2024
1e861b0
Merge pull request #248 from Achal1607/reworked-jdk-downloader
sid-srini Sep 10, 2024
d7f7d5d
Remove unused images
Achal1607 Sep 10, 2024
ea83122
Merge pull request #263 from Achal1607/remove-extra-images
Achal1607 Sep 11, 2024
2165638
Patch for unwanted imports bug from NB
subhash-arabhi Sep 10, 2024
e56d45c
Merge pull request #262 from subhash-arabhi/unwanted-imports-bug
Achal1607 Sep 11, 2024
fee381c
Patch for renaming comments bug
subhash-arabhi Sep 10, 2024
8b899d1
Merge pull request #261 from subhash-arabhi/rename-comments-bug
Achal1607 Sep 11, 2024
6240a1c
[JAVSCODE-253] adding/updating few language keys
naren2605 Sep 10, 2024
d24199e
Merge pull request #265 from naren2605/23.0.0
Achal1607 Sep 12, 2024
f3e9959
Upgrade to nb-23-rc3
Achal1607 Sep 8, 2024
d6147c3
Merge pull request #259 from Achal1607/nb-23-rc3
Achal1607 Sep 12, 2024
13bbb7b
fixed launch configuration issue while running tests
Achal1607 Sep 12, 2024
6079973
Merge pull request #266 from Achal1607/javavscode-148
sid-srini Sep 12, 2024
bf41231
Doing code cleanup and updated copyright
Achal1607 Sep 13, 2024
5558cdb
Merge pull request #268 from Achal1607/code-cleanup
Achal1607 Sep 13, 2024
1d8d2bd
[JAVSCODE-253] enabling nb support for localisation
naren2605 Sep 16, 2024
f474f97
JDK 23 download option added in JDK Downloader
Achal1607 Sep 17, 2024
1da4307
Merge pull request #274 from Achal1607/jdk-download-version-update
Achal1607 Sep 17, 2024
5425193
Merge pull request #273 from naren2605/23.0.0
sid-srini Sep 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ jobs:
with:
repository: apache/netbeans
path: netbeans
ref: 22
ref: 23-rc3

- name: Checkout NetBeans l10n
uses: actions/checkout@v4
with:
repository: apache/netbeans-l10n
path: netbeans-l10n
ref: ece00239dc7a208fba60703c2256ffd818da1646

- name: Apply NetBeans patches
run: ant apply-patches
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build/
netbeans/
.DS_STORE
.idea/
11 changes: 10 additions & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,22 @@ $ git clone https://github.com/oracle/javavscode.git
$ cd javavscode/
$ git clone https://github.com/apache/netbeans.git
$ cd netbeans/
$ git checkout 22
$ git checkout 23-rc3
$ cd ..
$ git clone https://github.com/apache/netbeans-l10n.git
$ cd netbeans-l10n
$ git checkout ece00239dc7a208fba60703c2256ffd818da1646 # head commit in master
$ cd ..
# the following target requires git executable to be on PATH:
$ ant apply-patches
$ ant build-netbeans

#Note if you do not wish to have l10n in scope then add no-l10n before any ant invocation target at beginning as below, by default l10n is enabled
$ ant no-l10n apply-patches
$ ant no-l10n build-netbeans
```


## Building VS Code extension

To build the VS Code extension invoke:
Expand Down
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

Oracle Java Platform Extension for Visual Studio Code
Copyright (c) 2023, Oracle and/or its affiliates.
Copyright (c) 2023-2024, Oracle and/or its affiliates.

Apache NetBeans
Copyright 2017-2023 The Apache Software Foundation
Copyright 2017-2024 The Apache Software Foundation

The code is based on NetBeans, that has been kindly donated to the Apache
Software Foundation by Oracle.
Expand Down
33 changes: 16 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,21 @@
[![Build Status](https://img.shields.io/github/actions/workflow/status/oracle/javavscode/main.yml?branch=main&style=for-the-badge&logo=github)](https://github.com/oracle/javavscode/actions?query=workflow:Java%20Platform%20Support%20for%20Visual%20Studio%20Code)
[![License](https://img.shields.io/github/license/oracle/javavscode?style=for-the-badge&logo=apache)](https://github.com/oracle/javavscode/blob/main/LICENSE.txt)

Java Platform extension from Oracle brings full featured development support (edit-compile-debug & test cycle) to VS Code. It offers support for Maven and Gradle projects.

Java Platform extension from Oracle brings full featured development support (edit-compile-debug & test cycle) to VS Code. It also offers support for Maven and Gradle projects. Applications using JDK 8 and above are supported.
## Getting Started
1. Set JDK in `View | Command Palette | Preferences:Open User Settings (JSON) ...` __jdk: Jdkhome__ setting to point to JDK which Language Server will run on and projects will be compiled with. More below in section [Selecting the JDK](#selecting-the-jdk)
2. If no JDK is present in your system then extension can setup things for you. More below in section [JDK Downloader](#jdk-downloader)
3. Use __Java: New Project...__ " command to start creating new project, or
4. Open the folder with existing __pom.xml__ for Maven or ___Gradle___ project files (_build.gradle, gradle.properties_). Language Server opens the project, resolves dependencies if any and performs priming build, or
5. Simply create a new Java class file with `public static void main(String[] args)` method in opened folder and start coding, compiling, debugging. Works on JDK 11 and newer.
1. Setting up the JDK
- If no JDK is present in your system then the extension can set things up for you. For more details refer to [JDK Downloader](#jdk-downloader) section.
- Set the JDK in the `View | Command Palette | Preferences: Open User Settings | Jdk: Jdkhome` setting to point to the JDK that the Language Server will run on and also by default use for running and compiling projects.
- The extension requires JDK 17 or newer to run.
- Optionally, set a different JDK to compile and run projects in the `View | Command Palette | Preferences: Open User Settings | Jdk › Project: Jdkhome` setting.
- By default, the __jdk.jdkhome__ setting is used.
- Projects can run on JDK 8 and above.
- For more information, see the section [Selecting the JDK](#selecting-the-jdk).
4. Use any one of the following ways to start coding, compiling and debugging in Java.
- Simply create a new Java class with `public static void main(String[] args)` method.
- Use the __Java: New From Template...__ command to create a new Java file.
- Use the __Java: New Project...__ command to create a new project.
- Open the folder with existing __Maven__ or __Gradle__ project files (_pom.xml_ or _build.gradle, gradle.properties_).

## Supported Actions
In the VS Code command palette :
Expand Down Expand Up @@ -159,19 +166,11 @@ When adding JavaDoc to code Oracle Java Platform extension assists by suggesting
Oracle Java Platform extension provides Test Explorer view which allows to run all tests in a project, examine the results, go to source code and run particular test.
![Test Explorer](vscode/images/Test_explorer.png)

## Supported Options

* __jdk.jdkhome__ - path to the JDK, see dedicated section below
* __jdk.verbose__ - enables verbose extension logging

## Selecting the JDK
The JDK to build, run and debug projects is being searched in the following locations:

The user projects are built, run and debugged using the same JDK which runs the
Oracle Java Platform extension. The JDK is being searched in
following locations:

- `jdk.project.jdkhome` setting (workspace then user settings)
- `jdk.jdkhome` setting (workspace then user settings)
- `java.home` setting (workspace then user settings)
- `JDK_HOME` environment variable
- `JAVA_HOME` environment variable
- current system path
Expand Down
Loading