Merge remote-tracking branch 'origin' into lsp-refactored-code

Achal1607 · Achal1607 · commit 198e68d56a57 · 2024-10-22T15:14:27.000+05:30
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -55,21 +55,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-          submodules: false
-
-      - name: Checkout NetBeans
-        uses: actions/checkout@v4
-        with:
-          repository: apache/netbeans
-          path: netbeans
-          ref: 23
-
-      - name: Checkout NetBeans l10n
-        uses: actions/checkout@v4
-        with:
-          repository: apache/netbeans-l10n
-          path: netbeans-l10n
-          ref: ece00239dc7a208fba60703c2256ffd818da1646
+          submodules: true
 
       - name: Apply NetBeans patches
         run: ant apply-patches
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
 build/
-netbeans/
-netbeans-l10n/
 .DS_STORE
 .idea/
 *.iml
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "netbeans-l10n"]
+	path = netbeans-l10n
+	url = https://github.com/apache/netbeans-l10n.git
+[submodule "netbeans"]
+	path = netbeans
+	url = https://github.com/apache/netbeans.git
diff --git a/BUILD.md b/BUILD.md
@@ -35,16 +35,7 @@
 ## Fetching and building the code
 
 ```bash
-$ git clone https://github.com/oracle/javavscode.git
-$ cd javavscode/
-$ git clone https://github.com/apache/netbeans.git
-$ cd netbeans/
-$ git checkout 23
-$ cd ..
-$ git clone https://github.com/apache/netbeans-l10n.git
-$ cd netbeans-l10n
-$ git checkout ece00239dc7a208fba60703c2256ffd818da1646 # head commit in master
-$ cd ..
+$ git clone --recurse-submodules https://github.com/oracle/javavscode.git
 # the following target requires git executable to be on PATH:
 $ ant apply-patches
 $ ant build-netbeans
@@ -107,3 +98,24 @@ $ npm_config_https_proxy=http://your.proxy.com:port ant test-vscode-ext
 
 when executing the tests for the first time. That shall overcome the proxy
 and download an instance of `code` to execute the tests with.
+
+## Working with submodules 
+This project uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) . In particular netbeans and netbeans-l10n are submodules pointing to specific commits in their respective repositories .
+### Switching Branches 
+Add the --recurse-submodules  flag to the git checkout command to update the submodules during the checkout.
+```bash
+git checkout --recurse-submodules <branch_name>
+```
+Note:- Merging branches with submodules pointing to different commits can be tricky. Refer the [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for more details on the same.
+### Changing submodules versions 
+```bash
+# Fetching changes from remote submodule repositories 
+git submodule update --remote   
+# Changing the submodule version
+cd netbeans
+git checkout <commit_hash>
+cd ..
+# Committing the submodule version 
+git add netbeans
+git commit -m "Updated netbeans"
+```
diff --git a/README.md b/README.md
@@ -169,7 +169,7 @@ Oracle Java Platform extension provides Test Explorer view which allows to run a
 ### Localisation support
 Oracle Java Platform extension provides localisation support for _Japanese_ and _Simplified Chinese_. 
 To switch language `Go to command Palette->Configure display language` select `ja` for _Japanese_ or `zh-cn` for _Simplified Chinese_ 
-![localisation.gif](localisation.gif)
+![localisation.gif](vscode/images/localisation.gif)
 
 ## Selecting the JDK
 The JDK to build, run and debug projects is being searched in the following locations:
diff --git a/netbeans b/netbeans
@@ -0,0 +1 @@
+Subproject commit 2985f1fa57ce0c1877bad0f86d5e5504d65f9286
diff --git a/netbeans-l10n b/netbeans-l10n
@@ -0,0 +1 @@
+Subproject commit ece00239dc7a208fba60703c2256ffd818da1646
diff --git a/vscode/README.md b/vscode/README.md
@@ -59,6 +59,12 @@ In the VS Code command palette :
 Project Explorer provides an overview of logical project structure, groups sources together and greatly simplifies Java package structure exploration. Project Explorer is an addition to the classical workspace explorer. Use it to build, test, execute and operate your Maven and Gradle Java projects.  
 ![Project Explorer](images/project-explorer.png)
 
+### Localisation support
+Oracle Java Platform extension provides localisation support for _Japanese_ and _Simplified Chinese_.
+To switch language `Go to command Palette->Configure display language` select `ja` for _Japanese_ or `zh-cn` for _Simplified Chinese_
+![localisation.gif](images/localisation.gif)
+
+
 ## Debugger and Launch Configurations
 Language Server __Java+ ...__ launch configuration supports debugging and running Java applications using JDK11 or newer. 
 1. The launch configuration (debugger) is invoked when `Run main | Debug main` code lense is selected in the code.
diff --git a/vscode/images/localisation.gif b/vscode/images/localisation.gif
diff --git a/vscode/src/constants.ts b/vscode/src/constants.ts
@@ -33,9 +33,8 @@ export namespace jdkDownloaderConstants {
   export const ORACLE_JDK_DOWNLOAD_VERSIONS = ['23', '21'];
 
   export const OPEN_JDK_VERSION_DOWNLOAD_LINKS: { [key: string]: string } = {
-    "23": "https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23"
-  };
+    "23": "https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e4004050f8781aa/11/GPL/openjdk-23.0.1"
+  };  
 }
 
-
 export const NODE_WINDOWS_LABEL = "Windows_NT";
diff --git a/vscode/src/webviews/jdkDownloader/view.ts b/vscode/src/webviews/jdkDownloader/view.ts
@@ -198,8 +198,12 @@ export class JdkDownloaderView {
     }
 
     private getMachineArchHtml = () => {
-        return `<option value="aarch64" ${this.machineArch === 'aarch64' ? 'selected' : null}>arm64</option>
-                <option value="x64" ${this.machineArch === 'x64' ? 'selected' : null}>x64</option>`
+        if (this.osType === 'windows') {
+            return `<option value="x64" selected>x64</option>`;
+        } else {
+            return `<option value="aarch64" ${this.machineArch === 'aarch64' ? 'selected' : null}>arm64</option>
+                    <option value="x64" ${this.machineArch === 'x64' ? 'selected' : null}>x64</option>`;
+        }
     }
 
     private getScriptJs = () => {
@@ -231,6 +235,28 @@ export class JdkDownloaderView {
                     triggerJDKDownload(event);
                 });
 
+                document.getElementById("oracleJDKOsTypeDropdown")?.addEventListener('change', (event) => {
+                    updateMachineArchOptions(event.target.id);
+                });
+
+                document.getElementById("openJDKOsTypeDropdown")?.addEventListener('change', (event) => {
+                    updateMachineArchOptions(event.target.id);
+                });
+                
+                const updateMachineArchOptions = (osDropdownId) => {
+                    const osDropdown = document.getElementById(osDropdownId);
+                    const machineArchDropdown = document.getElementById(osDropdownId.replace('OsTypeDropdown', 'MachineArchDropdown'));
+                    
+                    if (osDropdown.value === 'windows') {
+                        machineArchDropdown.innerHTML = '<option value="x64" selected>x64</option>';
+                    } else {
+                        machineArchDropdown.innerHTML = \`
+                            <option value="aarch64" \${machineArchDropdown.value === 'aarch64' ? 'selected' : null}>arm64</option>
+                            <option value="x64" \${machineArchDropdown.value === 'x64' ? 'selected' : null}>x64</option>
+                        \`;
+                    }
+                };
+
                 const hideOrDisplayDivs = (e) => {
                     const { id } = e.target;
                     if(activeButton){
