Rebased final java notebook

THIRD_PARTY_LICENSES.txt

@@ -329,11 +329,11 @@ ide/modules/ext/junixsocket-native-common-2.5.1.jar                   Apache-2.0
 ide/modules/ext/launcher-common-24.0.0.jar                            UPL
 ide/modules/ext/lucene-core-3.6.2.jar                                 Apache-2.0-lucene
 ide/modules/ext/nativeimage-24.0.0.jar                                UPL
-ide/modules/ext/org.eclipse.lsp4j-0.13.0.jar                          EPL-v20
-ide/modules/ext/org.eclipse.lsp4j.debug-0.13.0.jar                    EPL-v20
-ide/modules/ext/org.eclipse.lsp4j.generator-0.13.0.jar                EPL-v20
-ide/modules/ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar                  EPL-v20
-ide/modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar            EPL-v20
+ide/modules/ext/org.eclipse.lsp4j-0.16.0.jar                          EPL-v20
+ide/modules/ext/org.eclipse.lsp4j.debug-0.16.0.jar                    EPL-v20
+ide/modules/ext/org.eclipse.lsp4j.generator-0.16.0.jar                EPL-v20
+ide/modules/ext/org.eclipse.lsp4j.jsonrpc-0.16.0.jar                  EPL-v20
+ide/modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.16.0.jar            EPL-v20
 ide/modules/ext/org.eclipse.tm4e.core-0.14.1.jar                      EPL-v20
 ide/modules/ext/org.eclipse.xtend.lib-2.24.0.jar                      EPL-v20
 ide/modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar                EPL-v20
@@ -481,11 +481,11 @@ java/modules/ext/maven/search-api-7.1.5.jar                           Apache-2.0
 java/modules/ext/maven/search-backend-smo-7.1.5.jar                   Apache-2.0
 java/modules/ext/nb-javac-jdk-25-31.1-api.jar                         GPL-2-CP
 java/modules/ext/nb-javac-jdk-25-31.1.jar                             GPL-2-CP
-java/modules/ext/org.eclipse.lsp4j-0.13.0.jar                         EPL-v20
-java/modules/ext/org.eclipse.lsp4j.debug-0.13.0.jar                   EPL-v20
-java/modules/ext/org.eclipse.lsp4j.generator-0.13.0.jar               EPL-v20
-java/modules/ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar                 EPL-v20
-java/modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar           EPL-v20
+java/modules/ext/org.eclipse.lsp4j-0.16.0.jar                         EPL-v20
+java/modules/ext/org.eclipse.lsp4j.debug-0.16.0.jar                   EPL-v20
+java/modules/ext/org.eclipse.lsp4j.generator-0.16.0.jar               EPL-v20
+java/modules/ext/org.eclipse.lsp4j.jsonrpc-0.16.0.jar                 EPL-v20
+java/modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.16.0.jar           EPL-v20
 java/modules/ext/org.eclipse.xtend.lib-2.24.0.jar                     EPL-v20
 java/modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar               EPL-v20
 java/modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar               EPL-v20
@@ -9805,4 +9805,73 @@ Developer of the Original Software was Sun Microsystems, Inc. Portions
 Copyright 1997-2006 Sun Microsystems, Inc.
 
 
+------------------ END OF DEPENDENCY LICENSE --------------------
+
+Dependency: ajv
+===============
+
+------------------ START OF DEPENDENCY LICENSE --------------------
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+------------------ END OF DEPENDENCY LICENSE --------------------
+
+Dependency: nbformat.v4.5.schema.json
+====================
+Accessible at: vscode/src/notebooks/nbformat.v4.5.d7.schema.json
+Modified from source at: https://github.com/jupyter/nbformat/blob/main/nbformat/v4/nbformat.v4.5.schema.json
+License: BSD 3-Clause License
+
+------------------ START OF DEPENDENCY LICENSE --------------------
+BSD 3-Clause License
+
+- Copyright (c) 2001-2015, IPython Development Team
+- Copyright (c) 2015-, Jupyter Development Team
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ------------------ END OF DEPENDENCY LICENSE --------------------

build.xml

@@ -37,6 +37,7 @@
             patches/l10n/adding-java.lsp.server-ja-and-zh_CN.diff
             patches/l10n/24.1.0-release-content-changes.diff
             patches/l10n/24.1.0-previous-issues-fix.diff
+            patches/l10n/25.0.0-notebooks-l10n.diff
         </string>
         <filterchain>
             <tokenfilter delimoutput=" ">
@@ -79,6 +80,9 @@
             patches/dev-dependency-licenses.diff
             patches/nb-telemetry.diff
             patches/change-method-parameters-refactoring-qualified-names.diff
+            patches/upgrade-lsp4j.diff
+            patches/updated-show-input-params.diff
+            patches/java-notebooks.diff
         </string>
         <filterchain>
             <tokenfilter delimoutput=" ">

nbcode/nbproject/project.properties

@@ -28,6 +28,8 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-windows=false
 auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
 modules=\
     ${project.org.netbeans.modules.nbcode.integration} :\
-    ${project.org.netbeans.modules.nbcode.java.lsp.server.telemetry}
+    ${project.org.netbeans.modules.nbcode.java.lsp.server.telemetry}:\
+    ${project.org.netbeans.modules.nbcode.java.notebooks}
 project.org.netbeans.modules.nbcode.integration=integration
 project.org.netbeans.modules.nbcode.java.lsp.server.telemetry=telemetry
+project.org.netbeans.modules.nbcode.java.notebooks=notebooks

nbcode/notebooks/build.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2024-2025, Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project name="org.netbeans.modules.nbcode.java.notebook" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.netbeans.modules.nbcode.notebook.</description>
+    <property file="nbproject/suite.properties"/>
+    <property file="nbproject/project.properties"/>
+    <property name="nbantext.jar" location="${suite.dir}/../netbeans/nbbuild/build/nbantext.jar" />
+    <import file="nbproject/build-impl.xml"/>
+</project>

nbcode/notebooks/manifest.mf

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.netbeans.modules.nbcode.java.notebook
+OpenIDE-Module-Implementation-Version: 1
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nbcode/java/notebook/Bundle.properties
+

nbcode/notebooks/nbproject/build-impl.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2024-2025, Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project name="org.netbeans.modules.nbcode.java.notebook-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>

nbcode/notebooks/nbproject/genfiles.properties

@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2024-2025, Oracle and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+build.xml.data.CRC32=bcbc94fb
+build.xml.script.CRC32=f4d83a2b
+[email protected]
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=decee057
+nbproject/build-impl.xml.script.CRC32=547e2c6a
+nbproject/[email protected]

nbcode/notebooks/nbproject/project.properties

@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2024-2025, Oracle and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+javac.source=1.8
+requires.nb.javac=true
+javac.compilerargs=-Xlint -Xlint:-serial
+test.unit.lib.cp=
+test.unit.run.cp.extra=
+license.file=../../LICENSE.txt
+nbm.homepage=https://github.com/oracle/javavscode/
+nbplatform.default.netbeans.dest.dir=${suite.dir}/../netbeans/nbbuild/netbeans
+nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness
+spec.version.base=1.0