From fdb51e1633f928de57b8df6f7e53bf624a86d27c Mon Sep 17 00:00:00 2001 From: Siddharth Srinivasan Date: Tue, 2 Sep 2025 00:55:36 +0530 Subject: [PATCH 1/2] Fixed gradle integration tests initialization Corrected the init of the test folder structure for gradle integration tests to correspond to that expected when created using `gradle init`. --- .../suite/gradle/extension.test.ts | 26 ++++++++++++------- vscode/src/test/integration/testutils.ts | 8 +++--- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/vscode/src/test/integration/suite/gradle/extension.test.ts b/vscode/src/test/integration/suite/gradle/extension.test.ts index ef0a92b..5a66012 100644 --- a/vscode/src/test/integration/suite/gradle/extension.test.ts +++ b/vscode/src/test/integration/suite/gradle/extension.test.ts @@ -41,6 +41,7 @@ suite("Extension gradle tests", function () { assert.ok(compile, " Compile workspace command not working"); const mainClass = path.join( folder, + "yourProject", "build", "classes", "java", @@ -55,21 +56,28 @@ suite("Extension gradle tests", function () { "Class created by compilation: " + mainClass ); } catch (error) { - dumpJava(); + await dumpJava(); + console.log(`Error: ${error}`); throw error; } }); // Check if clean workspace command is excuted succesfully test("Clean workspace - Gradle", async () => { - let folder: string = assertWorkspace(); - const clean = await commands.executeCommand("jdk.workspace.clean"); - assert.ok(clean, " Clean workspace command not working"); + try { + let folder: string = assertWorkspace(); + const clean = await commands.executeCommand("jdk.workspace.clean"); + assert.ok(clean, " Clean workspace command not working"); - const mainClass = path.join(folder, "build"); - assert.ok( - !fs.existsSync(mainClass), - "Class created by compilation: " + mainClass - ); + const buildFolder = path.join(folder, "yourProject", "build"); + assert.ok( + !fs.existsSync(buildFolder), + "Build removed by clean: " + buildFolder + ); + } catch (error) { + await dumpJava(); + console.log(`Error: ${error}`); + throw error; + } }); }); diff --git a/vscode/src/test/integration/testutils.ts b/vscode/src/test/integration/testutils.ts index 2dd5f36..fb19afd 100644 --- a/vscode/src/test/integration/testutils.ts +++ b/vscode/src/test/integration/testutils.ts @@ -253,7 +253,8 @@ export const runShellCommand = async (command: string, folderPath: string) => { export async function gradleInitJavaApplication(folder: string) { const basePackage = "org.yourCompany.yourProject"; - const projectPath = path.join(folder); + const rootProjectPath = path.join(folder); + const projectPath = path.join(rootProjectPath, "yourProject"); const srcMainPath = path.join( projectPath, "src", @@ -272,6 +273,7 @@ export async function gradleInitJavaApplication(folder: string) { try { // Create directories + await fs.promises.mkdir(rootProjectPath, { recursive: true }); await fs.promises.mkdir(projectPath, { recursive: true }); await fs.promises.mkdir(srcMainPath, { recursive: true }); await fs.promises.mkdir(resourcesPath, { recursive: true }); @@ -283,7 +285,7 @@ export async function gradleInitJavaApplication(folder: string) { SAMPLE_BUILD_GRADLE ); await fs.promises.writeFile( - path.join(projectPath, "settings.gradle"), + path.join(rootProjectPath, "settings.gradle"), SAMPLE_SETTINGS_GRADLE ); // Create Java main file @@ -347,7 +349,7 @@ export const awaitClient = async () : Promise => { } export function findClusters(myPath : string): string[] { - let clusters = []; + let clusters:string[] = []; for (let e of vscode.extensions.all) { if (e.extensionPath === myPath) { continue; From 73871e07146df356bb842beec125ec9eb3faec7a Mon Sep 17 00:00:00 2001 From: Siddharth Srinivasan Date: Thu, 28 Aug 2025 13:49:21 +0530 Subject: [PATCH 2/2] Updating netbeans to release 27 1. Updated netbeans submodule to tag:27 i.e. branch:release270 HEAD. 2. Removed patches already merged in NB26 and NB27. 3. Fixed whitespace warnings in remaining patches 4. Updated third-party licenses text 5. Incorporated inline-hints support with the jdk.inlay.hints configuration. --- THIRD_PARTY_LICENSES.txt | 1885 ++++++++++++----- build.xml | 13 - .../nbcode/integration/resources/jaricon.svg | 91 + .../resources/uidefaults/Tree.closedIcon.svg | 37 + .../resources/uidefaults/Tree.leafIcon.svg | 37 + .../resources/uidefaults/Tree.openIcon.svg | 43 + netbeans | 2 +- patches/6330.diff | 17 +- patches/7893-draft.diff | 2 +- patches/8036-draft.diff | 234 -- patches/8210.diff | 435 ---- patches/8237.diff | 358 ---- patches/8242.diff | 140 -- patches/8245.diff | 212 -- patches/8255.diff | 90 - patches/8260.diff | 549 ----- patches/8280.diff | 88 - patches/8289.diff | 117 - patches/8442-draft.diff | 13 - patches/8470.diff | 129 -- patches/8484.diff | 135 -- patches/dev-dependency-licenses.diff | 9 +- patches/generate-dependencies.diff | 4 +- patches/javavscode-375.diff | 62 - patches/nb-telemetry.diff | 4 +- vscode/package.json | 22 +- vscode/package.nls.ja.json | 6 +- vscode/package.nls.json | 8 +- vscode/package.nls.zh-cn.json | 6 +- 29 files changed, 1622 insertions(+), 3126 deletions(-) create mode 100644 nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.svg create mode 100644 nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.closedIcon.svg create mode 100644 nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.leafIcon.svg create mode 100644 nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.openIcon.svg delete mode 100644 patches/8036-draft.diff delete mode 100644 patches/8210.diff delete mode 100644 patches/8237.diff delete mode 100644 patches/8242.diff delete mode 100644 patches/8245.diff delete mode 100644 patches/8255.diff delete mode 100644 patches/8260.diff delete mode 100644 patches/8280.diff delete mode 100644 patches/8289.diff delete mode 100644 patches/8442-draft.diff delete mode 100644 patches/8470.diff delete mode 100644 patches/8484.diff delete mode 100644 patches/javavscode-375.diff diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt index 962e2bf..b374349 100644 --- a/THIRD_PARTY_LICENSES.txt +++ b/THIRD_PARTY_LICENSES.txt @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -206,7 +207,7 @@ covered by the Apache license. These files are refered to by licenseinfo.xml files which hold the license information. ******************************************************************************** Apache NetBeans -Copyright 2017-2024 The Apache Software Foundation +Copyright 2017-2025 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -295,7 +296,7 @@ ide/modules/com-googlecode-javaewah-JavaEWAH.jar Apache-2.0 ide/modules/ext/antlr-runtime-3.5.3.jar BSD-antlr-runtime3 ide/modules/ext/antlr4-runtime-4.13.1.jar BSD-antlr-runtime4-3 ide/modules/ext/collections-24.0.0.jar UPL -ide/modules/ext/commons-compress-1.26.2.jar Apache-2.0 +ide/modules/ext/commons-compress-1.27.1.jar Apache-2.0 ide/modules/ext/flexmark-0.64.8.jar BSD-flexmark ide/modules/ext/flexmark-ext-anchorlink-0.64.8.jar BSD-flexmark ide/modules/ext/flexmark-ext-emoji-0.64.8.jar BSD-flexmark @@ -312,7 +313,7 @@ ide/modules/ext/flexmark-util-html-0.64.8.jar BSD-flexma ide/modules/ext/flexmark-util-misc-0.64.8.jar BSD-flexmark ide/modules/ext/flexmark-util-sequence-0.64.8.jar BSD-flexmark ide/modules/ext/flexmark-util-visitor-0.64.8.jar BSD-flexmark -ide/modules/ext/freemarker-2.3.33.jar Apache-2.0-freemarker +ide/modules/ext/freemarker-2.3.34.jar Apache-2.0-freemarker ide/modules/ext/jaxb/activation.jar EDL-1.0 ide/modules/ext/jaxb/api/jaxb-api.jar EDL-1.0 ide/modules/ext/jaxb/jaxb-impl.jar CDDL-1.1 @@ -320,7 +321,7 @@ ide/modules/ext/jaxb/jaxb-xjc.jar CDDL-1.1-M ide/modules/ext/jcodings-1.0.58.jar MIT-nocopyright ide/modules/ext/jline-24.0.0.jar BSD-jline3 ide/modules/ext/jniutils-24.0.0.jar UPL -ide/modules/ext/joni-2.2.1.jar MIT-jruby +ide/modules/ext/joni-2.2.6.jar MIT-jruby ide/modules/ext/json-simple-1.1.1.jar Apache-2.0 ide/modules/ext/jsoup-1.15.4.jar MIT-jsoup ide/modules/ext/junixsocket-common-2.5.1.jar Apache-2.0 @@ -333,7 +334,7 @@ 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.tm4e.core-0.14.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 ide/modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar EPL-v20 @@ -341,7 +342,7 @@ ide/modules/ext/polyglot-24.0.0.jar UPL ide/modules/ext/resolver-1.2.jar Apache-2.0 ide/modules/ext/simplevalidation-swing.jar Apache-2.0 ide/modules/ext/simplevalidation.jar Apache-2.0 -ide/modules/ext/toml-java-13.4.1.jar Apache-2.0 +ide/modules/ext/toml-java-13.4.2.jar Apache-2.0 ide/modules/ext/truffle-api-24.0.0.jar UPL-MIT-jcodings ide/modules/ext/truffle-compiler-24.0.0.jar UPL-MIT-jcodings ide/modules/ext/truffle-runtime-24.0.0.jar UPL-MIT-jcodings @@ -368,33 +369,39 @@ java/maven/bin/mvn.cmd Apache-2.0 java/maven/bin/mvnDebug Apache-2.0 java/maven/bin/mvnDebug.cmd Apache-2.0 java/maven/bin/mvnyjp Apache-2.0 -java/maven/boot/plexus-classworlds-2.8.0.jar Apache-2.0 +java/maven/boot/plexus-classworlds-2.9.0.jar Apache-2.0 java/maven/boot/plexus-classworlds.license Apache-2.0 java/maven/conf/logging/simplelogger.properties Apache-2.0 java/maven/conf/settings.xml Apache-2.0 java/maven/conf/toolchains.xml Apache-2.0 java/maven/lib/aopalliance-1.0.jar Apache-2.0 java/maven/lib/aopalliance.license Apache-2.0 -java/maven/lib/commons-cli-1.8.0.jar Apache-2.0 +java/maven/lib/asm-9.8.jar BSD-INRIA +java/maven/lib/asm.license Apache-2.0 +java/maven/lib/commons-cli-1.9.0.jar Apache-2.0 java/maven/lib/commons-cli.license Apache-2.0 -java/maven/lib/commons-codec-1.17.1.jar Apache-2.0 +java/maven/lib/commons-codec-1.18.0.jar Apache-2.0 java/maven/lib/commons-codec.license Apache-2.0 +java/maven/lib/error_prone_annotations-2.38.0.jar Apache-2.0 +java/maven/lib/error_prone_annotations.license Apache-2.0 java/maven/lib/ext/README.txt Apache-2.0 java/maven/lib/ext/hazelcast/README.txt Apache-2.0 java/maven/lib/ext/redisson/README.txt Apache-2.0 -java/maven/lib/failureaccess-1.0.2.jar Apache-2.0 +java/maven/lib/failureaccess-1.0.3.jar Apache-2.0 java/maven/lib/failureaccess.license Apache-2.0 -java/maven/lib/guava-33.2.1-jre.jar Apache-2.0 +java/maven/lib/gson-2.13.1.jar Apache-2.0 +java/maven/lib/gson.license Apache-2.0 +java/maven/lib/guava-33.4.8-jre.jar Apache-2.0 java/maven/lib/guava.license Apache-2.0 -java/maven/lib/guice-5.1.0.jar Apache-2.0 +java/maven/lib/guice-5.1.0-classes.jar Apache-2.0 java/maven/lib/guice.license Apache-2.0 java/maven/lib/httpclient-4.5.14.jar Apache-2.0 java/maven/lib/httpclient.license Apache-2.0 java/maven/lib/httpcore-4.4.16.jar Apache-2.0 java/maven/lib/httpcore.license Apache-2.0 -java/maven/lib/jansi-2.4.1.jar Apache-2.0 +java/maven/lib/jansi-2.4.2.jar Apache-2.0 java/maven/lib/jansi-native/README.txt Apache-2.0 -java/maven/lib/jansi-native/Windows/arm64/libjansi.so Apache-2.0 +java/maven/lib/jansi-native/Windows/arm64/jansi.dll Apache-2.0 java/maven/lib/jansi-native/Windows/x86/jansi.dll Apache-2.0 java/maven/lib/jansi-native/Windows/x86_64/jansi.dll Apache-2.0 java/maven/lib/jansi.license Apache-2.0 @@ -404,45 +411,45 @@ java/maven/lib/javax.inject-1.jar Apache-2.0 java/maven/lib/javax.inject.license Apache-2.0 java/maven/lib/jcl-over-slf4j-1.7.36.jar Apache-2.0 java/maven/lib/jcl-over-slf4j.license Apache-2.0 -java/maven/lib/maven-artifact-3.9.9.jar Apache-2.0 -java/maven/lib/maven-builder-support-3.9.9.jar Apache-2.0 -java/maven/lib/maven-compat-3.9.9.jar Apache-2.0 -java/maven/lib/maven-core-3.9.9.jar Apache-2.0 -java/maven/lib/maven-embedder-3.9.9.jar Apache-2.0 -java/maven/lib/maven-model-3.9.9.jar Apache-2.0 -java/maven/lib/maven-model-builder-3.9.9.jar Apache-2.0 -java/maven/lib/maven-plugin-api-3.9.9.jar Apache-2.0 -java/maven/lib/maven-repository-metadata-3.9.9.jar Apache-2.0 -java/maven/lib/maven-resolver-api-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-connector-basic-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-impl-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-named-locks-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-provider-3.9.9.jar Apache-2.0 -java/maven/lib/maven-resolver-spi-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-transport-file-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-transport-http-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-transport-wagon-1.9.22.jar Apache-2.0 -java/maven/lib/maven-resolver-util-1.9.22.jar Apache-2.0 -java/maven/lib/maven-settings-3.9.9.jar Apache-2.0 -java/maven/lib/maven-settings-builder-3.9.9.jar Apache-2.0 +java/maven/lib/jspecify-1.0.0.jar Apache-2.0 +java/maven/lib/jspecify.license Apache-2.0 +java/maven/lib/maven-artifact-3.9.11.jar Apache-2.0 +java/maven/lib/maven-builder-support-3.9.11.jar Apache-2.0 +java/maven/lib/maven-compat-3.9.11.jar Apache-2.0 +java/maven/lib/maven-core-3.9.11.jar Apache-2.0 +java/maven/lib/maven-embedder-3.9.11.jar Apache-2.0 +java/maven/lib/maven-model-3.9.11.jar Apache-2.0 +java/maven/lib/maven-model-builder-3.9.11.jar Apache-2.0 +java/maven/lib/maven-plugin-api-3.9.11.jar Apache-2.0 +java/maven/lib/maven-repository-metadata-3.9.11.jar Apache-2.0 +java/maven/lib/maven-resolver-api-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-connector-basic-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-impl-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-named-locks-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-provider-3.9.11.jar Apache-2.0 +java/maven/lib/maven-resolver-spi-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-transport-file-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-transport-http-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-transport-wagon-1.9.24.jar Apache-2.0 +java/maven/lib/maven-resolver-util-1.9.24.jar Apache-2.0 +java/maven/lib/maven-settings-3.9.11.jar Apache-2.0 +java/maven/lib/maven-settings-builder-3.9.11.jar Apache-2.0 java/maven/lib/maven-shared-utils-3.4.2.jar Apache-2.0 -java/maven/lib/maven-slf4j-provider-3.9.9.jar Apache-2.0 -java/maven/lib/org.eclipse.sisu.inject-0.9.0.M3.jar Maven-EPL-v10 +java/maven/lib/maven-slf4j-provider-3.9.11.jar Apache-2.0 +java/maven/lib/org.eclipse.sisu.inject-0.9.0.M4.jar Maven-EPL-v10 java/maven/lib/org.eclipse.sisu.inject.license Apache-2.0 -java/maven/lib/org.eclipse.sisu.plexus-0.9.0.M3.jar Maven-EPL-v10 +java/maven/lib/org.eclipse.sisu.plexus-0.9.0.M4.jar Maven-EPL-v10 java/maven/lib/org.eclipse.sisu.plexus.license Apache-2.0 java/maven/lib/plexus-cipher-2.0.jar Apache-2.0 java/maven/lib/plexus-cipher.license Apache-2.0 -java/maven/lib/plexus-component-annotations-2.1.0.jar Apache-2.0 +java/maven/lib/plexus-component-annotations-2.2.0.jar Apache-2.0 java/maven/lib/plexus-component-annotations.license Apache-2.0 -java/maven/lib/plexus-interpolation-1.27.jar Apache-2.0 +java/maven/lib/plexus-interpolation-1.28.jar Apache-2.0 java/maven/lib/plexus-interpolation.license Apache-2.0 java/maven/lib/plexus-sec-dispatcher-2.0.jar Apache-2.0 java/maven/lib/plexus-sec-dispatcher.license Apache-2.0 -java/maven/lib/plexus-utils-3.5.1.jar Apache-2.0 +java/maven/lib/plexus-utils-3.6.0.jar Apache-2.0 java/maven/lib/plexus-utils.license Apache-2.0 -java/maven/lib/plexus-xml-3.0.1.jar Apache-2.0 -java/maven/lib/plexus-xml.license Apache-2.0 java/maven/lib/slf4j-api-1.7.36.jar MIT-slf4j-22 java/maven/lib/slf4j-api.license Apache-2.0 java/maven/lib/wagon-file-3.5.3.jar Apache-2.0 @@ -451,29 +458,29 @@ java/maven/lib/wagon-http-shared-3.5.3.jar Apache-2.0 java/maven/lib/wagon-provider-api-3.5.3.jar Apache-2.0 java/modules/ext/checker-qual-3.9.1.jar MIT-checker java/modules/ext/corba/omgapi/glassfish-corba-omgapi.jar CDDL-1.1 -java/modules/ext/discoclient-2.0.24.jar Apache-2.0 -java/modules/ext/eclipselink/jakarta.persistence-2.2.3.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.12.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.asm-9.4.0.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.12.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.12.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.12.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.7.12.jar EPL-v20 -java/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.12.jar EPL-v20 -java/modules/ext/jdktools-11.0.11.jar Apache-2.0 +java/modules/ext/discoclient-2.0.39.jar Apache-2.0 +java/modules/ext/eclipselink/jakarta.persistence-2.2.3.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.12.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.asm-9.4.0.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.12.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.12.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.12.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.7.12.jar EPL-v10-eclipselink +java/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.12.jar EPL-v10-eclipselink +java/modules/ext/jdktools-11.0.19.jar Apache-2.0 java/modules/ext/maven/indexer-core-7.1.5.jar Apache-2.0 java/modules/ext/maven/javax.annotation-api-1.3.2.jar CDDL-1.1 java/modules/ext/maven/jdom2-2.0.6.1.jar BSD-JDOM -java/modules/ext/maven/lucene-analysis-common-9.12.0.jar Apache-2.0-lucene2 -java/modules/ext/maven/lucene-backward-codecs-9.12.0.jar Apache-2.0-lucene2 -java/modules/ext/maven/lucene-core-9.12.0.jar Apache-2.0-lucene2 -java/modules/ext/maven/lucene-highlighter-9.12.0.jar Apache-2.0-lucene2 -java/modules/ext/maven/lucene-queryparser-9.12.0.jar Apache-2.0-lucene2 +java/modules/ext/maven/lucene-analysis-common-9.12.1.jar Apache-2.0-lucene2 +java/modules/ext/maven/lucene-backward-codecs-9.12.1.jar Apache-2.0-lucene2 +java/modules/ext/maven/lucene-core-9.12.1.jar Apache-2.0-lucene2 +java/modules/ext/maven/lucene-highlighter-9.12.1.jar Apache-2.0-lucene2 +java/modules/ext/maven/lucene-queryparser-9.12.1.jar Apache-2.0-lucene2 java/modules/ext/maven/maven-dependency-tree-2.2.jar Apache-2.0 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-24-29-api.jar GPL-2-CP -java/modules/ext/nb-javac-jdk-24-29.jar GPL-2-CP +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 @@ -482,9 +489,9 @@ java/modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.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 -platform/core/asm-9.7.1.jar BSD-INRIA -platform/core/asm-commons-9.7.1.jar BSD-INRIA -platform/core/asm-tree-9.7.1.jar BSD-INRIA +platform/core/asm-9.8.jar BSD-INRIA +platform/core/asm-commons-9.8.jar BSD-INRIA +platform/core/asm-tree-9.8.jar BSD-INRIA platform/docs/junit-4.13.2-javadoc.jar EPL-v10 platform/docs/junit-4.13.2-sources.jar EPL-v10 platform/docs/junit-jupiter-api-5.10.3-javadoc.jar EPL-v20 @@ -498,14 +505,14 @@ platform/lib/nbexec.dll Apache-2.0 platform/lib/nbexec.exe Apache-2.0 platform/lib/nbexec64.dll Apache-2.0 platform/lib/nbexec64.exe Apache-2.0 -platform/modules/ext/commons-io-2.16.1.jar Apache-2.0 -platform/modules/ext/flatlaf-3.5.2.jar Apache-2.0 +platform/modules/ext/commons-io-2.18.0.jar Apache-2.0 +platform/modules/ext/flatlaf-3.6.1.jar Apache-2.0 platform/modules/ext/hamcrest-core-1.3.jar BSD-hamcrest platform/modules/ext/jcommander-1.78.jar Apache-2.0 platform/modules/ext/jersey2/jakarta.inject-2.6.1.jar EPL-v20 -platform/modules/ext/jna-5.14.0.jar Apache-2.0 -platform/modules/ext/jna-platform-5.14.0.jar Apache-2.0 -platform/modules/ext/jsvg-1.6.1.jar MIT-jsvg +platform/modules/ext/jna-5.17.0.jar Apache-2.0 +platform/modules/ext/jna-platform-5.17.0.jar Apache-2.0 +platform/modules/ext/jsvg-1.7.1.jar MIT-jsvg platform/modules/ext/junit-4.13.2.jar EPL-v10 platform/modules/ext/junit-jupiter-api-5.10.3.jar EPL-v20 platform/modules/ext/junit-jupiter-engine-5.10.3.jar EPL-v20 @@ -523,6 +530,7 @@ platform/modules/lib/flatlaf-windows-arm64.dll Apache-2.0 platform/modules/lib/flatlaf-windows-x86.dll Apache-2.0 platform/modules/lib/flatlaf-windows-x86_64.dll Apache-2.0 platform/modules/lib/i386/linux/libjnidispatch-nb.so Apache-2.0 +platform/modules/lib/libflatlaf-linux-arm64.so Apache-2.0 platform/modules/lib/libflatlaf-linux-x86_64.so Apache-2.0 platform/modules/lib/libflatlaf-macos-arm64.dylib Apache-2.0 platform/modules/lib/libflatlaf-macos-x86_64.dylib Apache-2.0 @@ -1731,6 +1739,20 @@ dmccann - December 22/2010 - 2.3 - Initial implementation ========================= Apache-2.0 ========================= ====== The following are the NOTICEs pertaining to components using this license. For the full license text, please see the license text below the NOTICEs +Apache NetBeans +Copyright 2017-2025 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +The code is based on NetBeans, that has been kindly donated to the Apache +Software Foundation by Oracle. + +The code was Copyright 1997-2016 Oracle and/or its affiliates. The Initial +Developer of the Original Software was Sun Microsystems, Inc. Portions +Copyright 1997-2006 Sun Microsystems, Inc. + + Gradle Inc.'s Gradle Tooling API Copyright 2007-2024 Gradle Inc. @@ -1762,7 +1784,7 @@ See the License for the specific language governing permissions and limitations under the License. -JDKTools version 11.0.11 +JDKTools version 11.0.19 Copyright 2022 Gerrit Grunwald. @@ -1805,16 +1827,16 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -1845,11 +1867,11 @@ Copyright 2001-2023 The Apache Software Foundation This software bundles the following NOTICE files from third party library providers: -META-INF/NOTICE in archive lib/guice-5.1.0.jar +META-INF/NOTICE in archive lib/guice-5.1.0-classes.jar Google Guice - Core Library Copyright 2006-2022 Google, Inc. -META-INF/NOTICE in archive lib/plexus-utils-3.5.1.jar and lib/plexus-xml-3.0.0.jar +META-INF/NOTICE in archive lib/plexus-utils-3.6.0.jar This product includes software developed by the Indiana University Extreme! Lab (http://www.extreme.indiana.edu/). This product includes software developed by @@ -1859,7 +1881,7 @@ javolution (http://javolution.org/). This product includes software developed by Rome (https://rome.dev.java.net/). -about.html in archive lib/org.eclipse.sisu.inject-0.9.0.M3.jar +about.html in archive lib/org.eclipse.sisu.inject-0.9.0.M4.jar @@ -1870,27 +1892,27 @@ about.html in archive lib/org.eclipse.sisu.inject-0.9.0.M3.jar

About org.eclipse.sisu.inject

- -

November 5, 2013

+ +

November 5, 2013

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is +

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was +apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at http://www.eclipse.org.

Third Party Content

-

The Content includes items that have been sourced from third parties as set -out below. If you did not receive this Content directly from the Eclipse Foundation, -the following is provided for informational purposes only, and you should look +

The Content includes items that have been sourced from third parties as set +out below. If you did not receive this Content directly from the Eclipse Foundation, +the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.

ASM 4.1

@@ -1954,6 +1976,13 @@ Copyright 2001-2024 The Apache Software Foundation Apache Commons IO Copyright 2002-2024 The Apache Software Foundation +Kotlin Compiler +Copyright 2010-2019 JetBrains s.r.o and respective authors and developers + +src/org/netbeans/swing/plaf/util/SmoothScrollPaneUI.java +This software includes code from IntelliJ IDEA Community Edition +Copyright (C) JetBrains s.r.o. +https://www.jetbrains.com/idea/ ====== license text follows @@ -2165,7 +2194,7 @@ Copyright 2002-2024 The Apache Software Foundation ========================= Apache-2.0+MIT+testng ========================= ====== The following are the NOTICEs pertaining to components using this license. For the full license text, please see the license text below the NOTICEs -JCommander Copyright Notices +JCommander Copyright Notices ============================ Copyright 2010 Cedric Beust @@ -3172,7 +3201,7 @@ THE SOFTWARE. ========================= Apache-2.0-lucene ========================= ====== The following are the NOTICEs pertaining to components using this license. For the full license text, please see the license text below the NOTICEs Apache Lucene -Copyright 2012 The Apache Software Foundation +Copyright 2019 The Apache Software Foundation The snowball stemmers in contrib/analyzers/common/src/java/net/sf/snowball @@ -3221,12 +3250,17 @@ stopword list that is BSD-licensed created by the Carrot2 project. The file resi in contrib/analyzers/stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt. See http://project.carrot2.org/license.html. +Includes lib/servlet-api-2.4.jar from Apache Tomcat +Includes lib/ant-1.7.1.jar and lib/ant-junit-1.7.1.jar from Apache Ant +Includes contrib/queries/lib/jakarta-regexp-1.4.jar from Apache Jakarta Regexp Includes software from other Apache Software Foundation projects, including, but not limited to: - - Apache Ant - - Apache Jakarta Regexp - - Commons Compress - - Xerces + - Commons Beanutils (contrib/benchmark/lib/commons-beanutils-1.7.0.jar) + - Commons Collections (contrib/benchmark/lib/commons-collections-3.1.jar) + - Commons Compress (contrib/benchmark/lib/commons-compress-1.0.jar) + - Commons Digester (contrib/benchmark/lib/commons-digester-1.7.jar) + - Commons Logging (contrib/benchmark/lib/commons-logging-1.0.4.jar) + - Xerces (contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar) The SmartChineseAnalyzer source code (under contrib/analyzers) was provided by Xiaoping Gao and copyright 2009 by www.imdict.net. @@ -3251,96 +3285,15 @@ the Apache CXF project and is Apache License 2.0. The Google Code Prettify is Apache License 2.0. See http://code.google.com/p/google-code-prettify/ -JUnit (junit-4.10) is licensed under the Common Public License v. 1.0 +JUnit (under lib/junit-4.7.jar) is licensed under the Common Public License v. 1.0 See http://junit.sourceforge.net/cpl-v10.html +JLine (under contrib/lucli/lib/jline.jar) is licensed under the BSD License. +See http://jline.sourceforge.net/ + This product includes code (JaspellTernarySearchTrie) from Java Spelling Checking Package (jaspell): http://jaspell.sourceforge.net/ License: The BSD License (http://www.opensource.org/licenses/bsd-license.php) -=========================================================================== -Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration -=========================================================================== - -This software includes a binary and/or source version of data from - - mecab-ipadic-2.7.0-20070801 - -which can be obtained from - - http://atilika.com/releases/mecab-ipadic/mecab-ipadic-2.7.0-20070801.tar.gz - -or - - http://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz - -=========================================================================== -mecab-ipadic-2.7.0-20070801 Notice -=========================================================================== - -Nara Institute of Science and Technology (NAIST), -the copyright holders, disclaims all warranties with regard to this -software, including all implied warranties of merchantability and -fitness, in no event shall NAIST be liable for -any special, indirect or consequential damages or any damages -whatsoever resulting from loss of use, data or profits, whether in an -action of contract, negligence or other tortuous action, arising out -of or in connection with the use or performance of this software. - -A large portion of the dictionary entries -originate from ICOT Free Software. The following conditions for ICOT -Free Software applies to the current dictionary as well. - -Each User may also freely distribute the Program, whether in its -original form or modified, to any third party or parties, PROVIDED -that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear -on, or be attached to, the Program, which is distributed substantially -in the same form as set out herein and that such intended -distribution, if actually made, will neither violate or otherwise -contravene any of the laws and regulations of the countries having -jurisdiction over the User or the intended distribution itself. - -NO WARRANTY - -The program was produced on an experimental basis in the course of the -research and development conducted during the project and is provided -to users as so produced on an experimental basis. Accordingly, the -program is provided without any warranty whatsoever, whether express, -implied, statutory or otherwise. The term "warranty" used herein -includes, but is not limited to, any warranty of the quality, -performance, merchantability and fitness for a particular purpose of -the program and the nonexistence of any infringement or violation of -any right of any third party. - -Each user of the program will agree and understand, and be deemed to -have agreed and understood, that there is no warranty whatsoever for -the program and, accordingly, the entire risk arising from or -otherwise connected with the program is assumed by the user. - -Therefore, neither ICOT, the copyright holder, or any other -organization that participated in or was otherwise related to the -development of the program and their respective officials, directors, -officers and other employees shall be held liable for any and all -damages, including, without limitation, general, special, incidental -and consequential damages, arising out of or otherwise in connection -with the use or inability to use the program or any product, material -or result produced or otherwise obtained by using the program, -regardless of whether they have been advised of, or otherwise had -knowledge of, the possibility of such damages at any time during the -project or thereafter. Each user will be deemed to have agreed to the -foregoing by his or her commencement of use of the program. The term -"use" as used herein includes, but is not limited to, the use, -modification, copying and distribution of the program and the -production of secondary products from the program. - -In the case where the program, whether in its original form or -modified, was distributed or delivered to or received by a user from -any person, organization or entity other than ICOT, unless it makes or -grants independently of ICOT any specific warranty to the user in -writing, such person, organization or entity, will also be exempted -from and not be held liable to the user for any such damages as noted -above as far as the program is concerned. - - ====== license text follows Apache License Version 2.0, January 2004 @@ -3782,9 +3735,6 @@ developed by Dawid Weiss and Marcin Miłkowski (https://github.com/morfologik/morfologik-stemming) and uses data from the BSD-licensed dictionary of Polish (SGJP, http://sgjp.pl/morfeusz/). -Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original -source code for this can be found at http://www.eclipse.org/jetty/downloads.php - =========================================================================== Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration =========================================================================== @@ -4437,372 +4387,414 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” === ====== -========================= BSD-INRIA ========================= +========================= Apache-2.0-typescript-language-server ========================= -******************************************************************************* -* ASM: a very small and fast Java bytecode manipulation framework -* Copyright (c) 2000-2011 INRIA, France Telecom -* 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 holders 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 OWNER 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. -******************************************************************************* +Parts of the code copied from the https://github.com/microsoft/vscode repository are licensed under the following license: +BEGIN LICENSE ---------------------------------------------------------------- +MIT License -=== -====== -========================= BSD-JDOM ========================= -====== The following are the NOTICEs pertaining to components using this license. For the full license text, please see the license text below the NOTICEs -This product includes software developed by the -JDOM Project (http://www.jdom.org/). +Copyright (c) 2015 - present Microsoft Corporation +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: -====== license text follows -/*-- +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin. - 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 disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. +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. - 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact . - - 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management . - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the - software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos - available at http://www.jdom.org/images/logos. +END LICESE ------------------------------------------------------------------- - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT - 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. +This applies to files that include the following license header: - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally - created by Jason Hunter and - Brett McLaughlin . For more information - on the JDOM Project, please see . +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ - */ +The rest of the code licensed under: -=== -====== -========================= BSD-antlr-go-grammar ========================= - [The "BSD licence"] - Copyright (c) 2017 Sasa Coh, Michał Błotniak - Copyright (c) 2019 Ivan Kochurkin, kvanttt@gmail.com, Positive Technologies - Copyright (c) 2019 Dmitry Rassadin, flipparassa@gmail.com, Positive Technologies - Copyright (c) 2021 Martin Mirchev, mirchevmartin2203@gmail.com - All rights reserved. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - 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. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + 1. Definitions. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -=== -====== -========================= BSD-antlr-icons ========================= + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. -Use of Antlr Icon(s) are originated from ANTLR Intelli-J Plugin from: -https://github.com/antlr/intellij-plugin-v4 repository which at the time of -writing is governed by the terms of the license below: + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -Copyright (c) 2013, Terence Parr -All rights reserved. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). - 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. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. - Neither the name of the {organization} nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." -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. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. -=== -====== -========================= BSD-antlr-runtime3 ========================= + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. - [The "BSD license"] - Copyright (c) 2010 Terence Parr - Maven Plugin - Copyright (c) 2009 Jim Idle + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: - All rights reserved. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and - 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. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. -=== -====== -========================= BSD-antlr-runtime4-3 ========================= + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. -Use of Antlr version 4.13.1 is governed by the terms of the license below: + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. - [The "BSD license"] -Copyright (c) 2012-2022 The ANTLR Project. All rights reserved. + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. -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. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. -3. Neither name of copyright holders nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. + END OF TERMS AND CONDITIONS -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 REGENTS 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. + APPENDIX: How to apply the Apache License to your work. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -=== -====== -========================= BSD-antlr4-grammar ========================= + Copyright {yyyy} {name of copyright owner} -Use of Antlr Grammar is governed by the terms of the license below: + 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 -[The "BSD license"] -Copyright (c) 2012-2014 Terence Parr -Copyright (c) 2012-2014 Sam Harwell -Copyright (c) 2015 Gerald Rosenberg -All rights reserved. + http://www.apache.org/licenses/LICENSE-2.0 -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: + 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. - 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. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +=== +====== +========================= BSD-INRIA ========================= + +******************************************************************************* +* ASM: a very small and fast Java bytecode manipulation framework +* Copyright (c) 2000-2011 INRIA, France Telecom +* 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 holders 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 OWNER 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. +******************************************************************************* + === ====== -========================= BSD-css3-grammar ========================= +========================= BSD-JDOM ========================= +====== The following are the NOTICEs pertaining to components using this license. For the full license text, please see the license text below the NOTICEs +This product includes software developed by the +JDOM Project (http://www.jdom.org/). -Copyright (c) 2009, Jim Idle, Temporal Wave LLC. -Copyright (c) 2018, Apache Software Foundation (ASF) -All rights reserved. +====== license text follows +/*-- -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: + Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin. + 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 disclaimer that follows + these conditions in the documentation and/or other materials + provided with the distribution. -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 __COPYRIGHT_OWNER__ nor the names - of __PRONOUN__ contributors may be used to endorse or promote products derived - from this software without specific prior written permission. + 3. The name "JDOM" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact . + + 4. Products derived from this software may not be called "JDOM", nor + may "JDOM" appear in their name, without prior written permission + from the JDOM Project Management . + + In addition, we request (but do not require) that you include in the + end-user documentation provided with the redistribution and/or in the + software itself an acknowledgement equivalent to the following: + "This product includes software developed by the + JDOM Project (http://www.jdom.org/)." + Alternatively, the acknowledgment may be graphical using the logos + available at http://www.jdom.org/images/logos. -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 OWNER 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. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT + 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. + + This software consists of voluntary contributions made by many + individuals on behalf of the JDOM Project and was originally + created by Jason Hunter and + Brett McLaughlin . For more information + on the JDOM Project, please see . + + */ === ====== -========================= BSD-flexmark ========================= - -Copyright (c) 2015-2016, Atlassian Pty Ltd -All rights reserved. - -Copyright (c) 2016-2020, Vladimir Schneider, -All rights reserved. +========================= BSD-antlr-go-grammar ========================= -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: + [The "BSD licence"] + Copyright (c) 2017 Sasa Coh, Michał Błotniak + Copyright (c) 2019 Ivan Kochurkin, kvanttt@gmail.com, Positive Technologies + Copyright (c) 2019 Dmitry Rassadin, flipparassa@gmail.com, Positive Technologies + Copyright (c) 2021 Martin Mirchev, mirchevmartin2203@gmail.com + All rights reserved. -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + 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. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. -* 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. + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -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. === ====== -========================= BSD-hamcrest ========================= +========================= BSD-antlr-icons ========================= -Copyright (c) 2000-2015 www.hamcrest.org +Use of Antlr Icon(s) are originated from ANTLR Intelli-J Plugin from: +https://github.com/antlr/intellij-plugin-v4 repository which at the time of +writing is governed by the terms of the license below: + +Copyright (c) 2013, Terence Parr All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. 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. + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -Neither the name of Hamcrest nor the names of its contributors may be used to -endorse or promote products derived from this software without specific prior -written permission. + 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. + + Neither the name of the {organization} 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 OWNER OR CONTRIBUTORS BE LIABLE FOR +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 @@ -4813,47 +4805,251 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. === ====== -========================= BSD-jline3 ========================= - -Copyright (c) 2002-2023, the original author or authors. -All rights reserved. - -https://opensource.org/licenses/BSD-3-Clause - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following -conditions are met: +========================= BSD-antlr-runtime3 ========================= -Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. + [The "BSD license"] + Copyright (c) 2010 Terence Parr + Maven Plugin - Copyright (c) 2009 Jim Idle -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. + All rights reserved. -Neither the name of JLine nor the names of its contributors -may be used to endorse or promote products derived from this -software without specific prior written permission. + 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. The name of the author may not 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 OWNER 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. + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. === ====== -========================= BSD-jsfoundation ========================= +========================= BSD-antlr-runtime4-3 ========================= + +Use of Antlr version 4.13.1 is governed by the terms of the license below: + + [The "BSD license"] +Copyright (c) 2012-2022 The ANTLR Project. 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 name of copyright holders 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 REGENTS 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. + + +=== +====== +========================= BSD-antlr4-grammar ========================= + +Use of Antlr Grammar is governed by the terms of the license below: + +[The "BSD license"] +Copyright (c) 2012-2014 Terence Parr +Copyright (c) 2012-2014 Sam Harwell +Copyright (c) 2015 Gerald Rosenberg +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. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + + +=== +====== +========================= BSD-css3-grammar ========================= + +Copyright (c) 2009, Jim Idle, Temporal Wave LLC. +Copyright (c) 2018, Apache Software Foundation (ASF) + +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 __COPYRIGHT_OWNER__ nor the names + of __PRONOUN__ 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 OWNER 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. + + +=== +====== +========================= BSD-flexmark ========================= + +Copyright (c) 2015-2016, Atlassian Pty Ltd +All rights reserved. + +Copyright (c) 2016-2020, Vladimir Schneider, +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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. + +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. + + +=== +====== +========================= BSD-hamcrest ========================= + +Copyright (c) 2000-2015 www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. 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. + +Neither the name of Hamcrest 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 OWNER 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. + + +=== +====== +========================= BSD-jline3 ========================= + +Copyright (c) 2002-2023, the original author or authors. +All rights reserved. + +https://opensource.org/licenses/BSD-3-Clause + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +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. + +Neither the name of JLine 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 OWNER 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. + + +=== +====== +========================= BSD-jsfoundation ========================= Copyright JS Foundation and other contributors, https://js.foundation/ @@ -6753,44 +6949,310 @@ This Agreement is governed by the laws of the State of New York and the intellec === ====== -========================= EPL-v20 ========================= +========================= EPL-v10-eclipselink ========================= -Eclipse Public License - v 2.0 -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. +Use of EclipseLink version 2.7.12 is governed by the terms of the license below: -1. Definitions -“Contribution” means: +License -a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and -b) in the case of each subsequent Contributor: -i) changes to the Program, and -ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. -“Contributor” means any person or entity that Distributes the Program. +The Eclipse Foundation makes available all content in this plug-in ("Content"). +Unless otherwise indicated below, the Content is provided to you under the terms +and conditions of the Eclipse Public License Version 1.0 ("EPL") and Eclipse +Distribution License Version 1.0 (“EDL”). For purposes of the EPL, "Program" +will mean the Content. -“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. +If you did not receive this Content directly from the Eclipse Foundation, the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor’s license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL and EDL still apply to any source code in the +Content and such source code may be obtained at http://www.eclipse.org. -“Program” means the Contributions Distributed in accordance with this Agreement. +Eclipse Public License - v 1.0 -“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. -“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. +1. DEFINITIONS -“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. +"Contribution" means: -“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy. +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and +b) in the case of each subsequent Contributor: -“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. +i) changes to the Program, and -“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. +ii) additions to the Program; -2. Grant of Rights -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works. +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. +"Contributor" means any person or entity that distributes the Program. -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor to +control, and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may participate in +any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement , including but not limited to the risks and costs +of program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation +may assign the responsibility to serve as the Agreement Steward to a suitable +separate entity. Each new version of the Agreement will be given a +distinguishing version number. The Program (including Contributions) may always +be distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to distribute the Program (including its Contributions) +under the new version. Except as expressly stated in Sections 2(a) and 2(b) +above, Recipient receives no rights or licenses to the intellectual property of +any Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted under +this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + + + +Eclipse Distribution License Version 1.0 + +Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + * 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. + * Neither the name of the Eclipse Foundation, Inc. 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 OWNER 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. + + + + +=== +====== +========================= EPL-v20 ========================= + +Eclipse Public License - v 2.0 +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. Definitions +“Contribution” means: + +a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and +b) in the case of each subsequent Contributor: +i) changes to the Program, and +ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. +“Contributor” means any person or entity that Distributes the Program. + +“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +“Program” means the Contributions Distributed in accordance with this Agreement. + +“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. + +“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. + +“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. + +“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy. + +“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. + +“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. + +2. Grant of Rights +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3). @@ -8578,6 +9040,381 @@ Title to copyright in this work will at all times remain with copyright holders. +=== +====== +========================= CC-BY-SA-3.0 ========================= +====== The following are the NOTICEs pertaining to components using this license. For the full license text, please see the license text below the NOTICEs + +ide/hudson.ui/src/org/netbeans/modules/hudson/ui/resources/instance.png +Original image from the Jenkins project (https://jenkins.io/): +https://github.com/jenkins-infra/jenkins.io/blob/master/content/images/logos/jenkins/jenkins.svg +(placed on square background, rendered to 16x16px with inkscape) + + +====== license text follows +Creative Commons Legal Code + +Attribution-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined below) for the purposes of this + License. + c. "Creative Commons Compatible License" means a license that is listed + at https://creativecommons.org/compatiblelicenses that has been + approved by Creative Commons as being essentially equivalent to this + License, including, at a minimum, because that license: (i) contains + terms that have the same purpose, meaning and effect as the License + Elements of this License; and, (ii) explicitly permits the relicensing + of adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same + License Elements as this License. + d. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + e. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + f. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + g. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + h. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + i. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + j. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + k. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(c), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(c), as requested. + b. You may Distribute or Publicly Perform an Adaptation only under the + terms of: (i) this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible + License. If you license the Adaptation under one of the licenses + mentioned in (iv), you must comply with the terms of that license. If + you license the Adaptation under the terms of any of the licenses + mentioned in (i), (ii) or (iii) (the "Applicable License"), you must + comply with the terms of the Applicable License generally and the + following provisions: (I) You must include a copy of, or the URI for, + the Applicable License with every copy of each Adaptation You + Distribute or Publicly Perform; (II) You may not offer or impose any + terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the Applicable + License; (III) You must keep intact all notices that refer to the + Applicable License and to the disclaimer of warranties with every copy + of the Work as included in the Adaptation You Distribute or Publicly + Perform; (IV) when You Distribute or Publicly Perform the Adaptation, + You may not impose any effective technological measures on the + Adaptation that restrict the ability of a recipient of the Adaptation + from You to exercise the rights granted to that recipient under the + terms of the Applicable License. This Section 4(b) applies to the + Adaptation as incorporated in a Collection, but this does not require + the Collection apart from the Adaptation itself to be made subject to + the terms of the Applicable License. + c. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Ssection 3(b), in the case of an + Adaptation, a credit identifying the use of the Work in the Adaptation + (e.g., "French translation of the Work by Original Author," or + "Screenplay based on original Work by Original Author"). The credit + required by this Section 4(c) may be implemented in any reasonable + manner; provided, however, that in the case of a Adaptation or + Collection, at a minimum such credit will appear, if a credit for all + contributing authors of the Adaptation or Collection appears, then as + part of these credits and in a manner at least as prominent as the + credits for the other contributing authors. For the avoidance of + doubt, You may only use the credit required by this Section for the + purpose of attribution in the manner set out above and, by exercising + Your rights under this License, You may not implicitly or explicitly + assert or imply any connection with, sponsorship or endorsement by the + Original Author, Licensor and/or Attribution Parties, as appropriate, + of You or Your use of the Work, without the separate, express prior + written permission of the Original Author, Licensor and/or Attribution + Parties. + d. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of the License. + + Creative Commons may be contacted at https://creativecommons.org/. + +=== +====== + Dependency: jsonc-parser ======================= diff --git a/build.xml b/build.xml index 067e9da..c10f2a3 100644 --- a/build.xml +++ b/build.xml @@ -48,22 +48,10 @@ patches/6330.diff patches/7610.diff - patches/8036-draft.diff patches/8038-draft.diff - patches/8210.diff - patches/8237.diff - patches/8242.diff - patches/8245.diff - patches/8255.diff - patches/8260.diff - patches/8280.diff - patches/8289.diff patches/8690.diff patches/7893-draft.diff - patches/8442-draft.diff patches/8460-draft.diff - patches/8470.diff - patches/8484.diff patches/8745-draft.diff patches/disable-error-notification.diff patches/mvn-sh.diff @@ -76,7 +64,6 @@ patches/dev-dependency-licenses.diff patches/nb-telemetry.diff patches/change-method-parameters-refactoring-qualified-names.diff - patches/javavscode-375.diff diff --git a/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.svg b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.svg new file mode 100644 index 0000000..3cfc78c --- /dev/null +++ b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Apache NetBeans Logo + + diff --git a/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.closedIcon.svg b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.closedIcon.svg new file mode 100644 index 0000000..6fd722d --- /dev/null +++ b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.closedIcon.svg @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.leafIcon.svg b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.leafIcon.svg new file mode 100644 index 0000000..6fd722d --- /dev/null +++ b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.leafIcon.svg @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.openIcon.svg b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.openIcon.svg new file mode 100644 index 0000000..7409d7d --- /dev/null +++ b/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.openIcon.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + diff --git a/netbeans b/netbeans index 0f82d96..312307d 160000 --- a/netbeans +++ b/netbeans @@ -1 +1 @@ -Subproject commit 0f82d968998b78ef4d323537d1149eb68e747d9a +Subproject commit 312307d41168e81225f112a1365f8706d843e5ea diff --git a/patches/6330.diff b/patches/6330.diff index 21b544c..b97bce3 100644 --- a/patches/6330.diff +++ b/patches/6330.diff @@ -1,17 +1,16 @@ diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java -index bb8a4e8183..b9662fe6cd 100644 +index 6a64eb01f7..c994ac0c39 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java -@@ -25,7 +25,7 @@ import java.io.OutputStream; +@@ -25,6 +25,7 @@ import java.io.OutputStream; import java.net.Inet4Address; import java.net.ServerSocket; import java.net.Socket; --import java.net.SocketException; +import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; - import java.util.concurrent.ExecutionException; -@@ -45,31 +45,39 @@ import org.openide.util.Pair; + import java.util.concurrent.CopyOnWriteArrayList; +@@ -45,31 +46,39 @@ import org.openide.util.Pair; "MSG_PortParseError=Cannot parse '{1}' as port in '{0}'" }) final class ConnectionSpec implements Closeable { @@ -20,7 +19,7 @@ index bb8a4e8183..b9662fe6cd 100644 + private final boolean hash; private final int port; // @GuardedBy (this) - private final List close = new ArrayList<>(); + private final List close = new CopyOnWriteArrayList<>(); // @GuardedBy (this) private final List closed = new ArrayList<>(); @@ -55,7 +54,7 @@ index bb8a4e8183..b9662fe6cd 100644 } throw new CommandException(555, Bundle.MSG_ConnectionSpecError(spec)); -@@ -109,6 +117,21 @@ final class ConnectionSpec implements Closeable { +@@ -109,6 +118,21 @@ final class ConnectionSpec implements Closeable { // listen on TCP ServerSocket server = new ServerSocket(port, 1, Inet4Address.getLoopbackAddress()); close.add(server); @@ -77,7 +76,7 @@ index bb8a4e8183..b9662fe6cd 100644 int localPort = server.getLocalPort(); Thread listeningThread = new Thread(prefix + " listening at port " + localPort) { @Override -@@ -118,7 +141,7 @@ final class ConnectionSpec implements Closeable { +@@ -118,7 +142,7 @@ final class ConnectionSpec implements Closeable { try { socket = server.accept(); close.add(socket); @@ -86,7 +85,7 @@ index bb8a4e8183..b9662fe6cd 100644 } catch (IOException ex) { if (isClosed(server)) { break; -@@ -130,25 +153,53 @@ final class ConnectionSpec implements Closeable { +@@ -130,25 +154,53 @@ final class ConnectionSpec implements Closeable { }; listeningThread.start(); out.write((prefix + " listening at port " + localPort + "\n").getBytes()); diff --git a/patches/7893-draft.diff b/patches/7893-draft.diff index f44e182..eaf8b52 100644 --- a/patches/7893-draft.diff +++ b/patches/7893-draft.diff @@ -124,7 +124,7 @@ index 891bfa328d..ed80b903a5 100644 + boolean isJavaTemplate = "text/x-java".equals(FileUtil.getMIMEType(template)); + CompletionStage userInput = client.showInputBox(new ShowInputBoxParams(Bundle.CTL_TemplateUI_SelectName(), desc.getProposedName())); + if(isJavaTemplate) userInput = userInput.thenCompose(new ValidateJavaObjectName()); -+ return userInput.thenApply(name -> {return name != null ? builder.name(name) : null;}); ++ return userInput.thenApply(name -> {return name != null ? builder.name(name) : null;}); } return CompletableFuture.completedFuture(builder); } diff --git a/patches/8036-draft.diff b/patches/8036-draft.diff deleted file mode 100644 index 1ba0dee..0000000 --- a/patches/8036-draft.diff +++ /dev/null @@ -1,234 +0,0 @@ -diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java -index 76bb6080c73c..5ac38f940612 100644 ---- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java -+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java -@@ -26,6 +26,7 @@ - import java.util.LinkedList; - import java.util.List; - import java.util.StringTokenizer; -+import java.util.concurrent.atomic.AtomicReference; - import java.util.logging.Level; - import java.util.logging.Logger; - import java.util.regex.Matcher; -@@ -46,6 +47,9 @@ - import org.netbeans.core.network.proxy.pac.PacUtils; - import org.openide.util.Lookup; - import org.openide.util.NbBundle; -+import org.openide.util.RequestProcessor; -+import org.openide.util.RequestProcessor.Task; -+import org.netbeans.core.ProxySettings; - - /** - * NetBeans implementation of a PAC script evaluator. This implementation -@@ -196,6 +200,7 @@ public class NbPacScriptEvaluator implements PacScriptEvaluator { - private static final String PAC_SOCKS5_FFEXT = "SOCKS5"; // Mozilla Firefox extension. Not part of original Netscape spec. - private static final String PAC_HTTP_FFEXT = "HTTP"; // Mozilla Firefox extension. Not part of original Netscape spec. - private static final String PAC_HTTPS_FFEXT = "HTTPS"; // Mozilla Firefox extension. Not part of original Netscape spec. -+ private static final RequestProcessor RP = new RequestProcessor(NbPacScriptEvaluator.class.getName(), Runtime.getRuntime().availableProcessors(), true, false); - private final String pacScriptSource; - - -@@ -213,7 +218,7 @@ public NbPacScriptEvaluator(String pacSourceCocde) throws PacParsingException { - @Override - public List findProxyForURL(URI uri) throws PacValidationException { - -- List jsResultAnalyzed; -+ List jsResultAnalyzed = null; - - // First try the cache - if (resultCache != null) { -@@ -222,38 +227,37 @@ public List findProxyForURL(URI uri) throws PacValidationException { - return jsResultAnalyzed; - } - } -- try { -- Object jsResult; -- synchronized (scriptEngine) { -- jsResult = scriptEngine.findProxyForURL(PacUtils.toStrippedURLStr(uri), uri.getHost()); -- } -- jsResultAnalyzed = analyzeResult(uri, jsResult); -- if (canUseURLCaching && (resultCache != null)) { -- resultCache.put(uri, jsResultAnalyzed); // save the result in the cache -- } -- return jsResultAnalyzed; -- } catch (NoSuchMethodException ex) { -- // If this exception occur at this time it is really, really unexpected. -- // We already gave the function a test spin in the constructor. -- Exceptions.printStackTrace(ex); -- return Collections.singletonList(Proxy.NO_PROXY); -- } catch (ScriptException ex) { -- LOGGER.log(Level.WARNING, "Error when executing PAC script function " + scriptEngine.getJsMainFunction().getJsFunctionName() + " : ", ex); -- return Collections.singletonList(Proxy.NO_PROXY); -- } catch (Exception ex) { // for runtime exceptions -- if (ex.getCause() != null) { -- if (ex.getCause() instanceof ClassNotFoundException) { -- // Is someone trying to break out of the sandbox ? -- LOGGER.log(Level.WARNING, "The downloaded PAC script is attempting to access Java class ''{0}'' which may be a sign of maliciousness. You should investigate this with your network administrator.", ex.getCause().getMessage()); -- return Collections.singletonList(Proxy.NO_PROXY); -+ -+ int timeout = ProxySettings.getPacScriptTimeout(); -+ -+ if (timeout <= 0){ -+ jsResultAnalyzed = executeProxyScript(uri); -+ } else { -+ AtomicReference> resultHolder = new AtomicReference<>(null); -+ Task task = RP.post(() -> { -+ resultHolder.set(executeProxyScript(uri)); -+ }); -+ -+ try{ -+ if(!task.waitFinished(timeout)){ -+ LOGGER.log(Level.WARNING, "Timeout when executing PAC script function: {0}", scriptEngine.getJsMainFunction().getJsFunctionName()); -+ } -+ } catch (InterruptedException ex) { -+ LOGGER.log(Level.WARNING, "PAC script execution interrupted: {0}", ex); -+ } finally { -+ if (!task.isFinished()) { -+ // interruptThread is set true for the RequestProcessor so cancel will interrupt without any setting -+ task.cancel(); - } - } -- // other unforseen errors -- LOGGER.log(Level.WARNING, "Error when executing PAC script function " + scriptEngine.getJsMainFunction().getJsFunctionName() + " : ", ex); -- return Collections.singletonList(Proxy.NO_PROXY); -+ jsResultAnalyzed = resultHolder.get(); - } -+ if (canUseURLCaching && (resultCache != null) && (jsResultAnalyzed != null)) { -+ resultCache.put(uri, jsResultAnalyzed); // save the result in the cache -+ } -+ return jsResultAnalyzed != null ? jsResultAnalyzed : Collections.singletonList(Proxy.NO_PROXY); - } -- -+ - @Override - public boolean usesCaching() { - return (canUseURLCaching && (resultCache != null)); -@@ -275,6 +279,32 @@ public String getPacScriptSource() { - return this.pacScriptSource; - } - -+ private List executeProxyScript(URI uri) { -+ try{ -+ Object jsResult; -+ synchronized (scriptEngine) { -+ jsResult = scriptEngine.findProxyForURL(PacUtils.toStrippedURLStr(uri), uri.getHost()); -+ } -+ return analyzeResult(uri, jsResult); -+ -+ } catch (NoSuchMethodException ex) { -+ // If this exception occur at this time it is really, really unexpected. -+ // We already gave the function a test spin in the constructor. -+ Exceptions.printStackTrace(ex); -+ } catch (ScriptException ex) { -+ LOGGER.log(Level.WARNING, "Error when executing PAC script function " + scriptEngine.getJsMainFunction().getJsFunctionName() + " : ", ex); -+ } catch (Exception ex) { // for runtime exceptions -+ if (ex.getCause() != null) { -+ if (ex.getCause() instanceof ClassNotFoundException) { -+ // Is someone trying to break out of the sandbox ? -+ LOGGER.log(Level.WARNING, "The downloaded PAC script is attempting to access Java class ''{0}'' which may be a sign of maliciousness. You should investigate this with your network administrator.", ex.getCause().getMessage()); -+ } -+ } -+ // other unforseen errors -+ LOGGER.log(Level.WARNING, "Error when executing PAC script function " + scriptEngine.getJsMainFunction().getJsFunctionName() + " : ", ex); -+ } -+ return null; -+ } - - - private PacScriptEngine getScriptEngine(String pacSource) throws PacParsingException { -diff --git a/platform/core.network/test/unit/data/pacFiles2/pac-test-timeout.js b/platform/core.network/test/unit/data/pacFiles2/pac-test-timeout.js -new file mode 100644 -index 000000000000..9e31d3cb76b1 ---- /dev/null -+++ b/platform/core.network/test/unit/data/pacFiles2/pac-test-timeout.js -@@ -0,0 +1,30 @@ -+/* -+ * 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 -+ * -+ * http://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. -+ */ -+ -+ -+ -+ -+// -+// A PAC script which takes long time to execute and wastes cpu resources -+// -+ -+function FindProxyForURL(url, host) -+{ -+ alert("pac-test-timeout.js"); -+ const repeatedA = "A".repeat(999); -+ while(true){ -+ console.log(repeatedA); -+ } -+ return "DIRECT"; -+} -\ No newline at end of file -diff --git a/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/PacEngineTest.java b/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/PacEngineTest.java -index 178c9b162feb..90812bfa4612 100644 ---- a/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/PacEngineTest.java -+++ b/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/PacEngineTest.java -@@ -27,9 +27,12 @@ - import org.junit.Before; - import org.junit.BeforeClass; - import org.junit.Test; -+import org.netbeans.core.ProxySettings; -+import static org.netbeans.core.ProxySettings.PAC_SCRIPT_TIMEOUT; - import org.netbeans.core.network.proxy.pac.impl.NbPacScriptEvaluatorFactory; - import org.netbeans.junit.NbModuleSuite; - import org.netbeans.junit.NbTestCase; -+import org.openide.util.NbPreferences; - - /** - * -@@ -73,6 +76,9 @@ public static final junit.framework.Test suite() { - @Test - public void testEngine() throws PacParsingException, IOException, URISyntaxException, PacValidationException { - System.out.println("toSemiColonListStr"); -+ -+ NbPreferences.forModule(ProxySettings.class) -+ .putInt(PAC_SCRIPT_TIMEOUT, 2000); - - PacScriptEvaluatorFactory factory = new NbPacScriptEvaluatorFactory(); - -@@ -81,6 +87,7 @@ public void testEngine() throws PacParsingException, IOException, URISyntaxExcep - testPacFile("pac-test3.js", factory, 1, false); - testPacFileMalicious("pac-test-sandbox-breakout.js", factory); - testPacFileMalicious("pac-test-getclass.js", factory); -+ testPacFileMalicious("pac-test-timeout.js", factory); - - testPacFile2("pac-test4.js", factory); - } -diff --git a/platform/o.n.core/src/org/netbeans/core/ProxySettings.java b/platform/o.n.core/src/org/netbeans/core/ProxySettings.java -index 2d29427cd3c2..bb0bc42ae19f 100644 ---- a/platform/o.n.core/src/org/netbeans/core/ProxySettings.java -+++ b/platform/o.n.core/src/org/netbeans/core/ProxySettings.java -@@ -49,6 +49,8 @@ public class ProxySettings { - public static final String USE_PROXY_ALL_PROTOCOLS = "useProxyAllProtocols"; // NOI18N - public static final String DIRECT = "DIRECT"; // NOI18N - public static final String PAC = "PAC"; // NOI18N -+ public static final String PAC_SCRIPT_TIMEOUT = "pacScriptTimeout"; // NOI18N -+ public static final int DEFAULT_TIMEOUT = 10000; - - public static final String SYSTEM_PROXY_HTTP_HOST = "systemProxyHttpHost"; // NOI18N - public static final String SYSTEM_PROXY_HTTP_PORT = "systemProxyHttpPort"; // NOI18N -@@ -141,6 +143,10 @@ public static int getProxyType () { - return type; - } - -+ public static int getPacScriptTimeout() { -+ return getPreferences () -+ .getInt(PAC_SCRIPT_TIMEOUT, DEFAULT_TIMEOUT); -+ } - - public static String getSystemHttpHost() { - return getPreferences().get(SYSTEM_PROXY_HTTP_HOST, ""); diff --git a/patches/8210.diff b/patches/8210.diff deleted file mode 100644 index 31bcf10..0000000 --- a/patches/8210.diff +++ /dev/null @@ -1,435 +0,0 @@ -diff --git a/java/java.editor/nbproject/project.xml b/java/java.editor/nbproject/project.xml -index 0b5a6e5d585a..7c09e3513d2a 100644 ---- a/java/java.editor/nbproject/project.xml -+++ b/java/java.editor/nbproject/project.xml -@@ -558,6 +558,10 @@ - - - -+ -+ org.netbeans.modules.lexer.nbbridge -+ -+ - - org.netbeans.modules.masterfs - -diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -index bddc6dbc8e8c..09437294e148 100644 ---- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -@@ -221,26 +221,35 @@ public static Completion.Kind elementKind2CompletionItemKind(ElementKind kind) { - } - } - -- public static Supplier> addImport(Document doc, int offset, ElementHandle handle) { -+ public static Supplier> addImportAndInjectPackageIfNeeded(Document doc, int offset, ElementHandle handle) { - return () -> { -- AtomicReference pkg = new AtomicReference<>(); -- List textEdits = modify2TextEdits(JavaSource.forDocument(doc), copy -> { -- copy.toPhase(JavaSource.Phase.RESOLVED); -- String fqn = SourceUtils.resolveImport(copy, copy.getTreeUtilities().pathFor(offset), handle.getQualifiedName()); -- if (fqn != null) { -- int idx = fqn.lastIndexOf('.'); -- if (idx >= 0) { -- pkg.set(fqn.substring(0, idx + 1)); -- } -- } -- }); -- if (textEdits.isEmpty() && pkg.get() != null) { -- textEdits.add(new TextEdit(offset, offset, pkg.get())); -+ ResolvedImport resolved = addImport(doc, offset, handle); -+ List edits; -+ String insertName = resolved.insertName(); -+ int dotIdx = insertName.lastIndexOf('.'); -+ if (dotIdx >= 0) { -+ edits = new ArrayList<>(resolved.importEdits().size() + 1); -+ edits.addAll(resolved.importEdits()); -+ edits.add(new TextEdit(offset, offset, insertName.substring(0, dotIdx + 1))); -+ } else { -+ edits = resolved.importEdits(); - } -- return textEdits; -+ return edits; - }; - } - -+ public static ResolvedImport addImport(Document doc, int offset, ElementHandle handle) { -+ AtomicReference insertName = new AtomicReference<>(); -+ List textEdits = modify2TextEdits(JavaSource.forDocument(doc), copy -> { -+ copy.toPhase(JavaSource.Phase.RESOLVED); -+ insertName.set(SourceUtils.resolveImport(copy, copy.getTreeUtilities().pathFor(offset), handle.getQualifiedName())); -+ }); -+ -+ return new ResolvedImport(textEdits, insertName.get()); -+ } -+ -+ public record ResolvedImport(List importEdits, String insertName) {} -+ - public static boolean isOfKind(Element e, EnumSet kinds) { - if (kinds.contains(e.getKind())) { - return true; -@@ -666,24 +675,19 @@ public Completion createAttributeValueItem(CompilationInfo info, String value, S - - @Override - public Completion createStaticMemberItem(CompilationInfo info, DeclaredType type, Element memberElem, TypeMirror memberType, boolean multipleVersions, int substitutionOffset, boolean isDeprecated, boolean addSemicolon, boolean smartType) { -- //TODO: prefer static imports (but would be much slower?) -- //TODO: should be resolveImport instead of addImports: -- Map imports = (Map) info.getCachedValue(KEY_IMPORT_TEXT_EDITS); -+ Map imports = (Map) info.getCachedValue(KEY_IMPORT_TEXT_EDITS); - if (imports == null) { - info.putCachedValue(KEY_IMPORT_TEXT_EDITS, imports = new HashMap<>(), CompilationInfo.CacheClearPolicy.ON_TASK_END); - } -- TextEdit currentClassImport = imports.computeIfAbsent(type.asElement(), toImport -> { -- List textEdits = modify2TextEdits(JavaSource.forFileObject(info.getFileObject()), wc -> { -- wc.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED); -- wc.rewrite(info.getCompilationUnit(), GeneratorUtilities.get(wc).addImports(wc.getCompilationUnit(), new HashSet<>(Arrays.asList(toImport)))); -- }); -- return textEdits.isEmpty() ? null : textEdits.get(0); -+ ResolvedImport currentClassImport = imports.computeIfAbsent(type.asElement(), toImport -> { -+ return addImport(doc, offset, ElementHandle.create(toImport)); - }); - String label = type.asElement().getSimpleName() + "." + memberElem.getSimpleName(); - String sortText = memberElem.getSimpleName().toString(); - String memberTypeName; - StringBuilder labelDetail = new StringBuilder(); -- StringBuilder insertText = new StringBuilder(label); -+ StringBuilder insertText = new StringBuilder(); -+ insertText.append(currentClassImport.insertName()).append(".").append(memberElem.getSimpleName()); - boolean asTemplate = false; - if (memberElem.getKind().isField()) { - memberTypeName = Utilities.getTypeName(info, memberType, false).toString(); -@@ -740,12 +744,12 @@ public Completion createStaticMemberItem(CompilationInfo info, DeclaredType type - .labelDescription(memberTypeName) - .insertText(insertText.toString()) - .insertTextFormat(asTemplate ? Completion.TextFormat.Snippet : Completion.TextFormat.PlainText) -- .sortText(String.format("%04d%s", (memberElem.getKind().isField() ? 720 : 750) + (smartType ? 1000 : 0), sortText)); -+ .sortText(String.format("%04d%s", (memberElem.getKind().isField() ? 720 : 750) + (smartType ? 0: 1000), sortText)); - if (labelDetail.length() > 0) { - builder.labelDetail(labelDetail.toString()); - } -- if (currentClassImport != null) { -- builder.additionalTextEdits(Collections.singletonList(currentClassImport)); -+ if (!currentClassImport.importEdits().isEmpty()) { -+ builder.additionalTextEdits(currentClassImport.importEdits()); - } - ElementHandle handle = SUPPORTED_ELEMENT_KINDS.contains(memberElem.getKind().name()) ? ElementHandle.create(memberElem) : null; - if (handle != null) { -@@ -1041,7 +1045,7 @@ private Completion createTypeItem(CompilationInfo info, String prefix, ElementHa - if (handle != null) { - builder.documentation(getDocumentation(doc, off, handle)); - if (!addSimpleName && !inImport) { -- builder.additionalTextEdits(addImport(doc, off, handle)); -+ builder.additionalTextEdits(addImportAndInjectPackageIfNeeded(doc, off, handle)); - } - } - if (isDeprecated) { -diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionCollector.java b/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionCollector.java -index 0289b2dcb13f..f7955ef64cf0 100644 ---- a/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionCollector.java -+++ b/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionCollector.java -@@ -276,7 +276,7 @@ private Completion createTypeItem(ElementHandle handle, TypeElement - } - if (handle != null) { - builder.documentation(JavaCompletionCollector.getDocumentation(doc, offset, handle)); -- builder.additionalTextEdits(JavaCompletionCollector.addImport(doc, offset, handle)); -+ builder.additionalTextEdits(JavaCompletionCollector.addImportAndInjectPackageIfNeeded(doc, offset, handle)); - } - if (isDeprecated) { - builder.addTag(Completion.Tag.Deprecated); -diff --git a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -new file mode 100644 -index 000000000000..d6e3d5669e65 ---- /dev/null -+++ b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -@@ -0,0 +1,291 @@ -+/* -+ * Licensed to the Apache Software Foundation (ASF) under one -+ * or more contributor license agreements. See the NOTICE file -+ * distributed with this work for additional information -+ * regarding copyright ownership. The ASF licenses this file -+ * to you 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 -+ * -+ * http://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. -+ */ -+package org.netbeans.modules.editor.java; -+ -+import java.util.ArrayList; -+import java.util.List; -+import java.util.concurrent.atomic.AtomicBoolean; -+import java.util.stream.Collectors; -+import javax.swing.text.Document; -+import static junit.framework.TestCase.assertNotNull; -+import static junit.framework.TestCase.assertTrue; -+import org.netbeans.api.editor.mimelookup.MimePath; -+import org.netbeans.api.java.lexer.JavaTokenId; -+import org.netbeans.api.java.source.JavaSource; -+import org.netbeans.api.java.source.SourceUtilsTestUtil; -+import org.netbeans.api.java.source.TestUtilities; -+import org.netbeans.api.lsp.Completion; -+import org.netbeans.api.lsp.Completion.Context; -+import org.netbeans.api.lsp.Completion.TriggerKind; -+import org.netbeans.api.lsp.TextEdit; -+import org.netbeans.junit.NbTestCase; -+import org.netbeans.spi.editor.mimelookup.MimeDataProvider; -+import org.openide.cookies.EditorCookie; -+import org.openide.filesystems.FileObject; -+import org.openide.filesystems.FileUtil; -+import org.openide.filesystems.MIMEResolver; -+import org.openide.util.Lookup; -+import org.openide.util.lookup.Lookups; -+ -+public class JavaCompletionCollectorTest extends NbTestCase { -+ -+ public JavaCompletionCollectorTest(String name) { -+ super(name); -+ } -+ -+ public void testStaticMembersAndImports() throws Exception { -+ AtomicBoolean found = new AtomicBoolean(); -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ public class Test { -+ public void test() { -+ if (call(|)) { -+ } -+ } -+ private boolean call(test.other.E e) { -+ return false; -+ } -+ } -+ """), -+ new FileDescription("test/other/E.java", -+ """ -+ package test.other; -+ public enum E { -+ A, B, C; -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if (completion.getLabel().equals("E.A")) { -+ assertEquals("14-14:\\nimport test.other.E;\\n\\n", -+ completion.getAdditionalTextEdits() -+ .get() -+ .stream() -+ .map(JavaCompletionCollectorTest::textEdit2String) -+ .collect(Collectors.joining(", "))); -+ assertEquals("E.A", -+ completion.getInsertText()); -+ found.set(true); -+ } -+ } -+ }); -+ assertTrue(found.get()); -+ } -+ -+ public void testStaticMembersAndNoImports() throws Exception { -+ AtomicBoolean found = new AtomicBoolean(); -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ public class Test { -+ public void test() { -+ if (call(|)) { -+ } -+ } -+ private boolean call(Outter.E e) { -+ return false; -+ } -+ } -+ class Outter { -+ public enum E { -+ A, B, C; -+ } -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if (completion.getLabel().equals("E.A")) { -+ assertNull(completion.getAdditionalTextEdits()); -+ assertEquals("Outter.E.A", -+ completion.getInsertText()); -+ found.set(true); -+ } -+ } -+ }); -+ assertTrue(found.get()); -+ } -+ -+ public void testTypeFromIndex1() throws Exception { -+ AtomicBoolean found = new AtomicBoolean(); -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ public class Test { -+ public void test() { -+ EEE| -+ } -+ } -+ """), -+ new FileDescription("test/other/EEE.java", -+ """ -+ package test.other; -+ public class EEE { -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if (completion.getLabel().equals("EEE")) { -+ assertEquals("14-14:\\nimport test.other.EEE;\\n\\n", -+ completion.getAdditionalTextEdits() -+ .get() -+ .stream() -+ .map(JavaCompletionCollectorTest::textEdit2String) -+ .collect(Collectors.joining(", "))); -+ assertEquals("EEE", -+ completion.getInsertText()); -+ found.set(true); -+ } -+ } -+ }); -+ assertTrue(found.get()); -+ } -+ -+ public void testTypeFromIndex2() throws Exception { -+ AtomicBoolean found = new AtomicBoolean(); -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ public class Test { -+ public void test() { -+ EEE| -+ } -+ interface EEE {} -+ } -+ """), -+ new FileDescription("test/other/EEE.java", -+ """ -+ package test.other; -+ public class EEE { -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if (completion.getLabel().equals("EEE") && -+ completion.getKind() == Completion.Kind.Class) { -+ assertEquals("67-67:test.other.", -+ completion.getAdditionalTextEdits() -+ .get() -+ .stream() -+ .map(JavaCompletionCollectorTest::textEdit2String) -+ .collect(Collectors.joining(", "))); -+ assertEquals("EEE", -+ completion.getInsertText()); -+ found.set(true); -+ } -+ } -+ }); -+ assertTrue(found.get()); -+ } -+ -+ private void runJavaCollector(List files, Validator> validator) throws Exception { -+ SourceUtilsTestUtil.prepareTest(new String[]{"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[]{new MIMEResolverImpl(), new MIMEDataProvider()}); -+ -+ FileObject scratch = SourceUtilsTestUtil.makeScratchDir(this); -+ FileObject cache = scratch.createFolder("cache"); -+ FileObject src = scratch.createFolder("src"); -+ FileObject mainFile = null; -+ int caretPosition = -1; -+ -+ for (FileDescription testFile : files) { -+ FileObject testFO = FileUtil.createData(src, testFile.fileName); -+ String code = testFile.code; -+ -+ if (mainFile == null) { -+ mainFile = testFO; -+ caretPosition = code.indexOf('|'); -+ -+ assertTrue(caretPosition >= 0); -+ -+ code = code.substring(0, caretPosition) + code.substring(caretPosition + 1); -+ } -+ -+ TestUtilities.copyStringToFile(testFO, code); -+ } -+ -+ assertNotNull(mainFile); -+ -+ if (sourceLevel != null) { -+ SourceUtilsTestUtil.setSourceLevel(mainFile, sourceLevel); -+ } -+ -+ SourceUtilsTestUtil.prepareTest(src, FileUtil.createFolder(scratch, "test-build"), cache); -+ SourceUtilsTestUtil.compileRecursively(src); -+ -+ EditorCookie ec = mainFile.getLookup().lookup(EditorCookie.class); -+ Document doc = ec.openDocument(); -+ JavaCompletionCollector collector = new JavaCompletionCollector(); -+ Context ctx = new Context(TriggerKind.Invoked, null); -+ List completions = new ArrayList<>(); -+ -+ JavaSource.forDocument(doc).runUserActionTask(cc -> { -+ cc.toPhase(JavaSource.Phase.RESOLVED); -+ }, true); -+ collector.collectCompletions(doc, caretPosition, ctx, completions::add); -+ validator.validate(completions); -+ } -+ -+ private static String textEdit2String(TextEdit te) { -+ return te.getStartOffset() + "-" + te.getEndOffset() + ":" + te.getNewText().replace("\n", "\\n"); -+ } -+ -+ private String sourceLevel; -+ -+ private final void setSourceLevel(String sourceLevel) { -+ this.sourceLevel = sourceLevel; -+ } -+ -+ interface Validator { -+ public void validate(T t) throws Exception; -+ } -+ -+ static class MIMEResolverImpl extends MIMEResolver { -+ -+ public String findMIMEType(FileObject fo) { -+ if ("java".equals(fo.getExt())) { -+ return "text/x-java"; -+ } else { -+ return null; -+ } -+ } -+ } -+ -+ static class MIMEDataProvider implements MimeDataProvider { -+ -+ @Override -+ public Lookup getLookup(MimePath mimePath) { -+ if ("text/x-java".equals(mimePath.getPath())) { -+ return Lookups.fixed(JavaTokenId.language()); -+ } -+ return null; -+ } -+ -+ } -+ -+ private static final class FileDescription { -+ -+ final String fileName; -+ final String code; -+ -+ public FileDescription(String fileName, String code) { -+ this.fileName = fileName; -+ this.code = code; -+ } -+ } -+} diff --git a/patches/8237.diff b/patches/8237.diff deleted file mode 100644 index 81a7376..0000000 --- a/patches/8237.diff +++ /dev/null @@ -1,358 +0,0 @@ -diff --git a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java -index ac22658fe54f..567481a37952 100644 ---- a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java -+++ b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java -@@ -91,6 +91,10 @@ public static interface ItemFactory { - - T createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef); - -+ default T createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean afterConstructorTypeParams, boolean smartType, int assignToVarOffset, boolean memberRef) { -+ return createExecutableItem(info, elem, type, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, smartType, assignToVarOffset, memberRef); -+ } -+ - T createThisOrSuperConstructorItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated, String name); - - T createOverrideMethodItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean implement); -@@ -1866,7 +1870,7 @@ private void insideMemberSelect(Env env) throws IOException { - String typeName = controller.getElementUtilities().getElementName(el, true) + "." + prefix; //NOI18N - TypeMirror tm = controller.getTreeUtilities().parseType(typeName, env.getScope().getEnclosingClass()); - if (tm != null && tm.getKind() == TypeKind.DECLARED) { -- addMembers(env, tm, ((DeclaredType) tm).asElement(), EnumSet.of(CONSTRUCTOR), null, inImport, insideNew, false, switchItemAdder); -+ addMembers(env, tm, ((DeclaredType) tm).asElement(), EnumSet.of(CONSTRUCTOR), null, inImport, insideNew, false, false, switchItemAdder); - } - } - } -@@ -1901,7 +1905,7 @@ private void insideMemberSelect(Env env) throws IOException { - } - } - } -- addMembers(env, type, el, kinds, baseType, inImport, insideNew, false, switchItemAdder); -+ addMembers(env, type, el, kinds, baseType, inImport, insideNew, false, false, switchItemAdder); - } - break; - default: -@@ -1914,7 +1918,7 @@ private void insideMemberSelect(Env env) throws IOException { - String typeName = controller.getElementUtilities().getElementName(el, true) + "." + prefix; //NOI18N - TypeMirror tm = controller.getTreeUtilities().parseType(typeName, env.getScope().getEnclosingClass()); - if (tm != null && tm.getKind() == TypeKind.DECLARED) { -- addMembers(env, tm, ((DeclaredType) tm).asElement(), EnumSet.of(CONSTRUCTOR), null, inImport, insideNew, false, switchItemAdder); -+ addMembers(env, tm, ((DeclaredType) tm).asElement(), EnumSet.of(CONSTRUCTOR), null, inImport, insideNew, false, false, switchItemAdder); - } - } - if (exs != null && !exs.isEmpty()) { -@@ -1939,7 +1943,7 @@ private void insideMemberSelect(Env env) throws IOException { - for (ElementHandle teHandle : ci.getDeclaredTypes(el.getSimpleName().toString(), ClassIndex.NameKind.SIMPLE_NAME, EnumSet.allOf(ClassIndex.SearchScope.class))) { - TypeElement te = teHandle.resolve(controller); - if (te != null && trees.isAccessible(scope, te)) { -- addMembers(env, te.asType(), te, kinds, baseType, inImport, insideNew, true, switchItemAdder); -+ addMembers(env, te.asType(), te, kinds, baseType, inImport, insideNew, true, false, switchItemAdder); - } - } - } -@@ -2215,7 +2219,7 @@ private void insideNewClass(Env env) throws IOException { - case GTGTGT: - controller = env.getController(); - TypeMirror tm = controller.getTrees().getTypeMirror(new TreePath(path, nc.getIdentifier())); -- addMembers(env, tm, ((DeclaredType) tm).asElement(), EnumSet.of(CONSTRUCTOR), null, false, false, false); -+ addMembers(env, tm, ((DeclaredType) tm).asElement(), EnumSet.of(CONSTRUCTOR), null, false, false, false, true, addSwitchItemDefault); - break; - } - } -@@ -4073,10 +4077,10 @@ public boolean accept(Element e, TypeMirror t) { - } - - private void addMembers(final Env env, final TypeMirror type, final Element elem, final EnumSet kinds, final DeclaredType baseType, final boolean inImport, final boolean insideNew, final boolean autoImport) throws IOException { -- addMembers(env, type, elem, kinds, baseType, inImport, insideNew, autoImport, addSwitchItemDefault); -+ addMembers(env, type, elem, kinds, baseType, inImport, insideNew, autoImport, false, addSwitchItemDefault); - } - -- private void addMembers(final Env env, final TypeMirror type, final Element elem, final EnumSet kinds, final DeclaredType baseType, final boolean inImport, final boolean insideNew, final boolean autoImport, AddSwitchRelatedItem addSwitchItem) throws IOException { -+ private void addMembers(final Env env, final TypeMirror type, final Element elem, final EnumSet kinds, final DeclaredType baseType, final boolean inImport, final boolean insideNew, final boolean autoImport, final boolean afterConstructorTypeParams, AddSwitchRelatedItem addSwitchItem) throws IOException { - Set smartTypes = getSmartTypes(env); - final TreePath path = env.getPath(); - TypeMirror actualType = type; -@@ -4220,7 +4224,7 @@ && isOfKindAndType(e.getEnclosingElement().asType(), e, kinds, baseType, scope, - break; - case CONSTRUCTOR: - ExecutableType et = (ExecutableType) asMemberOf(e, actualType, types); -- results.add(itemFactory.createExecutableItem(env.getController(), (ExecutableElement) e, et, anchorOffset, autoImport ? env.getReferencesCount() : null, typeElem != e.getEnclosingElement(), elements.isDeprecated(e), inImport, false, isOfSmartType(env, actualType, smartTypes), env.assignToVarPos(), false)); -+ results.add(itemFactory.createExecutableItem(env.getController(), (ExecutableElement) e, et, anchorOffset, autoImport ? env.getReferencesCount() : null, typeElem != e.getEnclosingElement(), elements.isDeprecated(e), inImport, false, afterConstructorTypeParams, isOfSmartType(env, actualType, smartTypes), env.assignToVarPos(), false)); - break; - case METHOD: - et = (ExecutableType) asMemberOf(e, actualType, types); -diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -index 09437294e148..4eb78d72617c 100644 ---- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -@@ -482,17 +482,22 @@ public Completion createVariableItem(CompilationInfo info, String varName, int s - - @Override - public Completion createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef) { -- return createExecutableItem(info, elem, type, null, null, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, smartType, assignToVarOffset, memberRef); -+ return createExecutableItem(info, elem, type, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, false, smartType, assignToVarOffset, memberRef); -+ } -+ -+ @Override -+ public Completion createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean afterConstructorTypeParams, boolean smartType, int assignToVarOffset, boolean memberRef) { -+ return createExecutableItem(info, elem, type, null, null, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, afterConstructorTypeParams, smartType, assignToVarOffset, memberRef); - } - - @Override - public Completion createTypeCastableExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, TypeMirror castType, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef) { -- return createExecutableItem(info, elem, type, null, castType, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, smartType, assignToVarOffset, memberRef); -+ return createExecutableItem(info, elem, type, null, castType, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, false, smartType, assignToVarOffset, memberRef); - } - - @Override - public Completion createThisOrSuperConstructorItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated, String name) { -- return createExecutableItem(info, elem, type, name, null, substitutionOffset, null, false, isDeprecated, false, false, false, -1, false); -+ return createExecutableItem(info, elem, type, name, null, substitutionOffset, null, false, isDeprecated, false, false, false, false, -1, false); - } - - @Override -@@ -1054,14 +1059,16 @@ private Completion createTypeItem(CompilationInfo info, String prefix, ElementHa - return builder.build(); - } - -- private Completion createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, String name, TypeMirror castType, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef) { -+ private Completion createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, String name, TypeMirror castType, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean afterConstructorTypeParams, boolean smartType, int assignToVarOffset, boolean memberRef) { - String simpleName = name != null ? name : (elem.getKind() == ElementKind.METHOD ? elem : elem.getEnclosingElement()).getSimpleName().toString(); - Iterator it = elem.getParameters().iterator(); - Iterator tIt = type.getParameterTypes().iterator(); - StringBuilder labelDetail = new StringBuilder(); - StringBuilder insertText = new StringBuilder(); - StringBuilder sortParams = new StringBuilder(); -- insertText.append(simpleName); -+ if (!afterConstructorTypeParams) { -+ insertText.append(simpleName); -+ } - labelDetail.append("("); - CodeStyle cs = CodeStyle.getDefault(doc); - if (!inImport && !memberRef) { -diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java -index 09945ede0eaa..6c16e6df828d 100644 ---- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java -+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java -@@ -191,12 +191,12 @@ public static JavaCompletionItem createVariableItem(CompilationInfo info, String - return new VariableItem(info, null, varName, substitutionOffset, newVarName, smartType, -1); - } - -- public static JavaCompletionItem createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, TypeMirror castType, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef, WhiteListQuery.WhiteList whiteList) { -+ public static JavaCompletionItem createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, TypeMirror castType, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean afterConstructorTypeParams, boolean smartType, int assignToVarOffset, boolean memberRef, WhiteListQuery.WhiteList whiteList) { - switch (elem.getKind()) { - case METHOD: - return new MethodItem(info, elem, type, castType, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, smartType, assignToVarOffset, memberRef, whiteList); - case CONSTRUCTOR: -- return new ConstructorItem(info, elem, type, substitutionOffset, isDeprecated, smartType, null, whiteList); -+ return new ConstructorItem(info, elem, type, substitutionOffset, isDeprecated, afterConstructorTypeParams, smartType, null, whiteList); - default: - throw new IllegalArgumentException("kind=" + elem.getKind()); - } -@@ -204,7 +204,7 @@ public static JavaCompletionItem createExecutableItem(CompilationInfo info, Exec - - public static JavaCompletionItem createThisOrSuperConstructorItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated, String name, WhiteListQuery.WhiteList whiteList) { - if (elem.getKind() == ElementKind.CONSTRUCTOR) { -- return new ConstructorItem(info, elem, type, substitutionOffset, isDeprecated, false, name, whiteList); -+ return new ConstructorItem(info, elem, type, substitutionOffset, isDeprecated, false, false, name, whiteList); - } - throw new IllegalArgumentException("kind=" + elem.getKind()); - } -@@ -2489,6 +2489,7 @@ static class ConstructorItem extends WhiteListJavaCompletionItem modifiers; - private List params; - private boolean isAbstract; -@@ -2497,11 +2498,12 @@ static class ConstructorItem extends WhiteListJavaCompletionItem(); -@@ -2551,7 +2553,7 @@ public CharSequence getSortText() { - - @Override - public CharSequence getInsertPrefix() { -- return simpleName; -+ return insertPrefix; - } - - @Override -diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItemFactory.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItemFactory.java -index ac08274cb7e4..3078d30455a7 100644 ---- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItemFactory.java -+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItemFactory.java -@@ -109,12 +109,17 @@ public JavaCompletionItem createVariableItem(CompilationInfo info, String varNam - - @Override - public JavaCompletionItem createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef) { -- return JavaCompletionItem.createExecutableItem(info, elem, type, null, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, smartType, assignToVarOffset, memberRef, whiteList); -+ return createExecutableItem(info, elem, type, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, false, smartType, assignToVarOffset, memberRef); -+ } -+ -+ @Override -+ public JavaCompletionItem createExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean afterConstructorTypeParams, boolean smartType, int assignToVarOffset, boolean memberRef) { -+ return JavaCompletionItem.createExecutableItem(info, elem, type, null, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, afterConstructorTypeParams, smartType, assignToVarOffset, memberRef, whiteList); - } - - @Override - public JavaCompletionItem createTypeCastableExecutableItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, TypeMirror castType, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarOffset, boolean memberRef) { -- return JavaCompletionItem.createExecutableItem(info, elem, type, castType, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, smartType, assignToVarOffset, memberRef, whiteList); -+ return JavaCompletionItem.createExecutableItem(info, elem, type, castType, substitutionOffset, referencesCount, isInherited, isDeprecated, inImport, addSemicolon, false, smartType, assignToVarOffset, memberRef, whiteList); - } - - @Override -diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionItem.java b/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionItem.java -index 22151927877c..9f35779388b7 100644 ---- a/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionItem.java -+++ b/java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionItem.java -@@ -212,7 +212,7 @@ public CompletionItem createNameItem(String name, int startOffset) { - @Override - public CompletionItem createJavadocExecutableItem(CompilationInfo info, ExecutableElement e, ExecutableType et, int startOffset, boolean isInherited, boolean isDeprecated) { - CompletionItem delegate = JavaCompletionItem.createExecutableItem( -- info, e, et, null, startOffset, null, isInherited, isDeprecated, false, false, false, -1, false, null); -+ info, e, et, null, startOffset, null, isInherited, isDeprecated, false, false, false, false, -1, false, null); - return new JavadocExecutableItem(delegate, e, startOffset); - } - -diff --git a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -index d6e3d5669e65..bc1e4bdb87cf 100644 ---- a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -+++ b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -@@ -19,7 +19,9 @@ - package org.netbeans.modules.editor.java; - - import java.util.ArrayList; -+import java.util.HashSet; - import java.util.List; -+import java.util.Set; - import java.util.concurrent.atomic.AtomicBoolean; - import java.util.stream.Collectors; - import javax.swing.text.Document; -@@ -32,6 +34,7 @@ - import org.netbeans.api.java.source.TestUtilities; - import org.netbeans.api.lsp.Completion; - import org.netbeans.api.lsp.Completion.Context; -+import org.netbeans.api.lsp.Completion.TextFormat; - import org.netbeans.api.lsp.Completion.TriggerKind; - import org.netbeans.api.lsp.TextEdit; - import org.netbeans.junit.NbTestCase; -@@ -194,6 +197,108 @@ public class EEE { - assertTrue(found.get()); - } - -+ public void testNewWithTypeParameters() throws Exception { -+ Set found = new HashSet<>(); -+ -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ import java.util.*; -+ public class Test { -+ public void test() { -+ Map m = new HashMap<>| -+ } -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if ("HashMap".equals(completion.getLabel())) { -+ if ("()".equals(completion.getLabelDetail())) { -+ assertNull(completion.getTextEdit()); -+ assertNull(completion.getAdditionalTextEdits()); -+ assertEquals("()", completion.getInsertText()); -+ found.add("()"); -+ } else if (completion.getLabelDetail().contains("float")) { -+ assertNull(completion.getTextEdit()); -+ assertNull(completion.getAdditionalTextEdits()); -+ assertEquals(TextFormat.Snippet, completion.getInsertTextFormat()); -+ String insert = completion.getInsertText(); -+ assertNotNull(insert); -+ insert = insert.replaceFirst(":[^<>}]+\\}", ":\\}"); -+ insert = insert.replaceFirst(":[^<>}]+\\}", ":\\}"); -+ assertEquals("(${1:}, ${2:})$0", insert); -+ found.add("(int, float)"); -+ } -+ } -+ } -+ }); -+ assertEquals(Set.of("()", "(int, float)"), found); -+ } -+ -+ public void testNewWithoutTypeParameters() throws Exception { -+ Set found = new HashSet<>(); -+ -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ import java.util.*; -+ public class Test { -+ public void test() { -+ Map m = new HashMap| -+ } -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if ("HashMap".equals(completion.getLabel())) { -+ if ("()".equals(completion.getLabelDetail())) { -+ assertNull(completion.getTextEdit()); -+ assertNull(completion.getAdditionalTextEdits()); -+ assertEquals("HashMap()", completion.getInsertText()); -+ found.add("()"); -+ } else if (completion.getLabelDetail().contains("float")) { -+ assertNull(completion.getTextEdit()); -+ assertNull(completion.getAdditionalTextEdits()); -+ assertEquals(TextFormat.Snippet, completion.getInsertTextFormat()); -+ String insert = completion.getInsertText(); -+ assertNotNull(insert); -+ insert = insert.replaceFirst(":[^<>}]+\\}", ":\\}"); -+ insert = insert.replaceFirst(":[^<>}]+\\}", ":\\}"); -+ assertEquals("HashMap(${1:}, ${2:})$0", insert); -+ found.add("(int, float)"); -+ } -+ } -+ } -+ }); -+ assertEquals(Set.of("()", "(int, float)"), found); -+ } -+ -+ public void testAfterDot() throws Exception { -+ Set found = new HashSet<>(); -+ -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ import java.util.*; -+ public class Test { -+ public static Map test() { -+ Map m = Test.| -+ } -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if ("test".equals(completion.getLabel())) { -+ assertNull(completion.getTextEdit()); -+ assertNull(completion.getAdditionalTextEdits()); -+ assertEquals("test()", completion.getInsertText()); -+ found.add(completion.getLabelDetail()); -+ } -+ } -+ }); -+ assertEquals(Set.of("()"), found); -+ } -+ - private void runJavaCollector(List files, Validator> validator) throws Exception { - SourceUtilsTestUtil.prepareTest(new String[]{"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[]{new MIMEResolverImpl(), new MIMEDataProvider()}); - diff --git a/patches/8242.diff b/patches/8242.diff deleted file mode 100644 index ab2fc6b..0000000 --- a/patches/8242.diff +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -index 4eb78d72617c..788c3055aa8a 100644 ---- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionCollector.java -@@ -39,6 +39,7 @@ - import java.util.Iterator; - import java.util.List; - import java.util.Map; -+import java.util.Objects; - import java.util.Set; - import java.util.concurrent.Callable; - import java.util.concurrent.CompletableFuture; -@@ -824,6 +825,7 @@ public Completion createInitializeAllConstructorItem(CompilationInfo info, boole - } - labelDetail.append(") - generate"); - sortParams.append(')'); -+ ElementHandle parentPath = ElementHandle.create(parent); - return CompletionCollector.newBuilder(simpleName) - .kind(Completion.Kind.Constructor) - .labelDetail(labelDetail.toString()) -@@ -834,7 +836,11 @@ public Completion createInitializeAllConstructorItem(CompilationInfo info, boole - wc.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED); - TreePath tp = wc.getTreeUtilities().pathFor(substitutionOffset); - if (TreeUtilities.CLASS_TREE_KINDS.contains(tp.getLeaf().getKind())) { -- if (parent == wc.getTrees().getElement(tp)) { -+ Element currentType = wc.getTrees().getElement(tp); -+ ElementHandle currentTypePath = -+ currentType != null ? ElementHandle.create(currentType) -+ : null; -+ if (Objects.equals(parentPath, currentTypePath)) { - ArrayList fieldElements = new ArrayList<>(); - for (VariableElement fieldElement : fields) { - if (fieldElement != null && fieldElement.getKind().isField()) { -diff --git a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -index bc1e4bdb87cf..328a1b5bf62a 100644 ---- a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -+++ b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCompletionCollectorTest.java -@@ -18,6 +18,7 @@ - */ - package org.netbeans.modules.editor.java; - -+import java.io.OutputStream; - import java.util.ArrayList; - import java.util.HashSet; - import java.util.List; -@@ -48,6 +49,8 @@ - - public class JavaCompletionCollectorTest extends NbTestCase { - -+ private FileObject primaryTestFO; -+ - public JavaCompletionCollectorTest(String name) { - super(name); - } -@@ -299,21 +302,62 @@ public static Map test() { - assertEquals(Set.of("()"), found); - } - -+ public void testAdditionalEditsGenerateConstructorAfterReparse() throws Exception { -+ AtomicBoolean found = new AtomicBoolean(); -+ runJavaCollector(List.of(new FileDescription("test/Test.java", -+ """ -+ package test; -+ public class Test { -+ private final int i; -+ | -+ } -+ """)), -+ completions -> { -+ for (Completion completion : completions) { -+ if (completion.getLabel().equals("Test") && -+ "(int i) - generate".equals(completion.getLabelDetail())) { -+ //force full reparse: -+ byte[] content = primaryTestFO.asBytes(); -+ try (OutputStream out = primaryTestFO.getOutputStream()) { -+ out.write(content); -+ } -+ assertEquals(null, -+ completion.getInsertText()); -+ assertEquals("63-63:", -+ textEdit2String(completion.getTextEdit())); -+ assertEquals(""" -+ 59-59: -+ public Test(int i) { -+ this.i = i; -+ } -+ """.replace("\n", "\\n"), -+ completion.getAdditionalTextEdits() -+ .get() -+ .stream() -+ .map(JavaCompletionCollectorTest::textEdit2String) -+ .collect(Collectors.joining(", "))); -+ found.set(true); -+ } -+ } -+ }); -+ assertTrue(found.get()); -+ } -+ - private void runJavaCollector(List files, Validator> validator) throws Exception { - SourceUtilsTestUtil.prepareTest(new String[]{"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[]{new MIMEResolverImpl(), new MIMEDataProvider()}); - - FileObject scratch = SourceUtilsTestUtil.makeScratchDir(this); - FileObject cache = scratch.createFolder("cache"); - FileObject src = scratch.createFolder("src"); -- FileObject mainFile = null; -+ primaryTestFO = null; - int caretPosition = -1; - - for (FileDescription testFile : files) { - FileObject testFO = FileUtil.createData(src, testFile.fileName); - String code = testFile.code; - -- if (mainFile == null) { -- mainFile = testFO; -+ if (primaryTestFO == null) { -+ primaryTestFO = testFO; - caretPosition = code.indexOf('|'); - - assertTrue(caretPosition >= 0); -@@ -324,16 +368,16 @@ private void runJavaCollector(List files, Validator text) { - } - - public DocCommentTree DocComment(List fullBody, List tags) { -- DCDocComment temp = docMake.at(NOPOS).newDocCommentTree(fullBody, tags); -- return DocComment(temp.getFirstSentence(), temp.getBody(), temp.getBlockTags()); -+ return DocComment(HTML_JAVADOC_COMMENT, fullBody, tags); - } - - public DocCommentTree MarkdownDocComment(List fullBody, List tags) { -- DCDocComment temp = docMake.at(NOPOS).newDocCommentTree(fullBody, tags); -- return MarkdownDocComment(temp.getFirstSentence(), temp.getBody(), temp.getBlockTags()); -+ return DocComment(MARKDOWN_JAVADOC_COMMENT, fullBody, tags); - } - -+ private DocCommentTree DocComment(Comment comment, List fullBody, List tags) { -+ return docMake.at(NOPOS).newDocCommentTree(comment, fullBody, tags, Collections.emptyList(), Collections.emptyList()); -+ } -+ - public DocTree Snippet(List attributes, TextTree text){ - try { - return (DocTree) docMake.getClass().getMethod("newSnippetTree", List.class, TextTree.class).invoke(docMake.at(NOPOS), attributes, text); -diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java -index 037eb8251775..8b77849102a8 100644 ---- a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java -+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java -@@ -45,6 +45,7 @@ - import com.sun.tools.javac.tree.DCTree.DCLink; - import com.sun.tools.javac.tree.DCTree.DCLiteral; - import com.sun.tools.javac.tree.DCTree.DCParam; -+import com.sun.tools.javac.tree.DCTree.DCRawText; - import com.sun.tools.javac.tree.DCTree.DCReference; - import com.sun.tools.javac.tree.DCTree.DCReturn; - import com.sun.tools.javac.tree.DCTree.DCSee; -@@ -4722,6 +4723,9 @@ private int diffDocTree(DCDocComment doc, DCTree oldT, DCTree newT, int[] elemen - case TEXT: - localpointer = diffText(doc, (DCText)oldT, (DCText)newT, elementBounds); - break; -+ case MARKDOWN: -+ localpointer = diffRawText(doc, (DCRawText)oldT, (DCRawText)newT, elementBounds); -+ break; - case AUTHOR: - localpointer = diffAuthor(doc, (DCAuthor)oldT, (DCAuthor)newT, elementBounds); - break; -@@ -4944,6 +4948,15 @@ private int diffText(DCDocComment doc, DCText oldT, DCText newT, int[] elementBo - return elementBounds[1]; - } - -+ private int diffRawText(DCDocComment doc, DCTree.DCRawText oldT, DCTree.DCRawText newT, int[] elementBounds) { -+ if(oldT.code.equals(newT.code)) { -+ copyTo(elementBounds[0], elementBounds[1]); -+ } else { -+ printer.print(newT.code); -+ } -+ return elementBounds[1]; -+ } -+ - private int diffAuthor(DCDocComment doc, DCAuthor oldT, DCAuthor newT, int[] elementBounds) { - int localpointer = oldT.name.isEmpty()? elementBounds[1] : getOldPos(oldT.name.get(0), doc); - copyTo(elementBounds[0], localpointer); -diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/RewriteInCommentTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/RewriteInCommentTest.java -index 5c3ce2e65646..5effccaf023d 100644 ---- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/RewriteInCommentTest.java -+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/RewriteInCommentTest.java -@@ -18,6 +18,13 @@ - */ - package org.netbeans.api.java.source.gen; - -+import com.sun.source.doctree.DocCommentTree; -+import com.sun.source.doctree.LinkTree; -+import com.sun.source.doctree.RawTextTree; -+import com.sun.source.doctree.ReferenceTree; -+import com.sun.source.util.DocTreePath; -+import com.sun.source.util.DocTreePathScanner; -+import com.sun.source.util.TreePath; - import java.io.File; - import java.io.IOException; - import org.netbeans.api.java.source.ModificationResult; -@@ -134,7 +141,128 @@ public void run(WorkingCopy copy) throws Exception { - - assertEquals(code.replace("test", "foo"), mr.getResultingSource(fo)); - } -- -+ -+ public void testDoNotBreakFormatting() throws Exception { -+ File f = new File(getWorkDir(), "TestClass.java"); -+ String code = """ -+ package foo; -+ /** -+ * First line. -+ * Test {@link #test}. -+ */ -+ public class TestClass{ -+ } -+ """; -+ TestUtilities.copyStringToFile(f, code); -+ FileObject fo = FileUtil.toFileObject(f); -+ JavaSource javaSource = JavaSource.forFileObject(fo); -+ ModificationResult mr = javaSource.runModificationTask(new Task() { -+ -+ public void run(WorkingCopy copy) throws Exception { -+ copy.toPhase(Phase.RESOLVED); -+ -+ TreePath topLevelClass = new TreePath(new TreePath(copy.getCompilationUnit()), -+ copy.getCompilationUnit().getTypeDecls().get(0)); -+ DocCommentTree docComment = copy.getDocTrees().getDocCommentTree(topLevelClass); -+ -+ new DocTreePathScanner<>() { -+ @Override -+ public Object visitReference(ReferenceTree rt, Object p) { -+ copy.rewrite(topLevelClass.getLeaf(), rt, copy.getTreeMaker().Reference(null, "newName", null)); -+ return null; -+ } -+ -+ @Override -+ public Object visitLink(LinkTree lt, Object p) { -+ return super.visitLink(lt, p); -+ } -+ }.scan(new DocTreePath(topLevelClass, docComment), null); -+ } -+ }); -+ -+ assertEquals(code.replace("test", "newName"), mr.getResultingSource(fo)); -+ } -+ -+ public void testDoNotBreakFormattingMarkdown() throws Exception { -+ File f = new File(getWorkDir(), "TestClass.java"); -+ String code = """ -+ package foo; -+ -+ /// First line. -+ /// Test {@link #test}. -+ public class TestClass{ -+ } -+ """; -+ TestUtilities.copyStringToFile(f, code); -+ FileObject fo = FileUtil.toFileObject(f); -+ JavaSource javaSource = JavaSource.forFileObject(fo); -+ ModificationResult mr = javaSource.runModificationTask(new Task() { -+ -+ public void run(WorkingCopy copy) throws Exception { -+ copy.toPhase(Phase.RESOLVED); -+ -+ TreePath topLevelClass = new TreePath(new TreePath(copy.getCompilationUnit()), -+ copy.getCompilationUnit().getTypeDecls().get(0)); -+ DocCommentTree docComment = copy.getDocTrees().getDocCommentTree(topLevelClass); -+ -+ new DocTreePathScanner<>() { -+ @Override -+ public Object visitReference(ReferenceTree rt, Object p) { -+ copy.rewrite(topLevelClass.getLeaf(), rt, copy.getTreeMaker().Reference(null, "newName", null)); -+ return null; -+ } -+ -+ @Override -+ public Object visitLink(LinkTree lt, Object p) { -+ return super.visitLink(lt, p); -+ } -+ }.scan(new DocTreePath(topLevelClass, docComment), null); -+ } -+ }); -+ -+ assertEquals(code.replace("test", "newName"), mr.getResultingSource(fo)); -+ } -+ -+ public void testMarkdownChangeText() throws Exception { -+ File f = new File(getWorkDir(), "TestClass.java"); -+ String code = """ -+ package foo; -+ -+ /// First line. -+ /// Second line. -+ public class TestClass{ -+ } -+ """; -+ TestUtilities.copyStringToFile(f, code); -+ FileObject fo = FileUtil.toFileObject(f); -+ JavaSource javaSource = JavaSource.forFileObject(fo); -+ ModificationResult mr = javaSource.runModificationTask(new Task() { -+ -+ public void run(WorkingCopy copy) throws Exception { -+ copy.toPhase(Phase.RESOLVED); -+ -+ TreePath topLevelClass = new TreePath(new TreePath(copy.getCompilationUnit()), -+ copy.getCompilationUnit().getTypeDecls().get(0)); -+ DocCommentTree docComment = copy.getDocTrees().getDocCommentTree(topLevelClass); -+ -+ new DocTreePathScanner<>() { -+ @Override -+ public Object visitDocComment(DocCommentTree dct, Object p) { -+ //XXX: need to translate full body, as the split body has different split of the text trees, and the differ uses fullbody: -+ return scan(dct.getFullBody(), p); -+ } -+ @Override -+ public Object visitRawText(RawTextTree text, Object p) { -+ copy.rewrite(topLevelClass.getLeaf(), text, copy.getTreeMaker().RawText(text.getContent().replace("line", "nueText"))); -+ return null; -+ } -+ }.scan(new DocTreePath(topLevelClass, docComment), null); -+ } -+ }); -+ -+ assertEquals(code.replace("line", "nueText"), mr.getResultingSource(fo)); -+ } -+ - String getGoldenPckg() { - return ""; - } diff --git a/patches/8255.diff b/patches/8255.diff deleted file mode 100644 index 72dd7b7..0000000 --- a/patches/8255.diff +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ClassIndex.java b/java/java.source.base/src/org/netbeans/api/java/source/ClassIndex.java -index 849672370e84..45bc3fea4ce7 100644 ---- a/java/java.source.base/src/org/netbeans/api/java/source/ClassIndex.java -+++ b/java/java.source.base/src/org/netbeans/api/java/source/ClassIndex.java -@@ -830,6 +830,8 @@ private void createQueriesForRoots (final ClassPath cp, final boolean sources, f - if (ci != null) { - ci.addClassIndexImplListener(spiListener); - queries.add (ci); -+ } else { -+ spiListener.attachClassIndexManagerListener(); - } - } - } -diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ClassIndexTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ClassIndexTest.java -index 674da8164972..49f0c32e8b00 100644 ---- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ClassIndexTest.java -+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ClassIndexTest.java -@@ -31,6 +31,8 @@ - import javax.lang.model.element.ElementKind; - import javax.lang.model.element.TypeElement; - import javax.swing.event.ChangeListener; -+import javax.tools.JavaFileObject; -+import javax.tools.ToolProvider; - import org.netbeans.api.java.classpath.ClassPath; - import org.netbeans.api.java.classpath.GlobalPathRegistry; - import org.netbeans.api.java.platform.JavaPlatformManager; -@@ -92,6 +94,7 @@ public static NbTestSuite suite() { - suite.addTest(new ClassIndexTest("testPackageUsages")); //NOI18N - suite.addTest(new ClassIndexTest("testNullRootPassedToClassIndexEvent")); //NOI18N - suite.addTest(new ClassIndexTest("testFindSymbols")); //NOI18N -+ suite.addTest(new ClassIndexTest("testQueryIndexRefreshQueryAgain")); //NOI18N - return suite; - } - -@@ -576,6 +579,55 @@ public void testFindSymbols() throws Exception { - assertEquals(new HashSet(Arrays.asList("test.foo:[foo]", "test.Test:[foo]")), actualResult); - } - -+ public void testQueryIndexRefreshQueryAgain() throws Exception { -+ final FileObject wd = FileUtil.toFileObject(getWorkDir()); -+ final FileObject root = FileUtil.createFolder(wd,"src"); //NOI18N -+ final FileObject classes = FileUtil.createFolder(wd,"classes"); //NOI18N -+ sourcePath = ClassPathSupport.createClassPath(root); -+ final FileObject t1 = createJavaFile( -+ root, -+ "org.me.test", //NOI18N -+ "T1", //NOI18N -+ "package org.me.test;\n"+ //NOI18N -+ "public class T1 extends java.util.ArrayList {}"); //NOI18N -+ //compile binary dependency: -+ JavaFileObject libraryJFO = -+ FileObjects.memoryFileObject("lib", -+ "TestLib.java", -+ """ -+ package lib; -+ public class TestLib {} -+ """); -+ ToolProvider.getSystemJavaCompiler() -+ .getTask(null, -+ null, -+ null, -+ List.of("-d", -+ FileUtil.toFile(classes).getAbsolutePath()), -+ null, -+ List.of(libraryJFO)) -+ .call(); -+ -+ compilePath = ClassPathSupport.createClassPath(classes); -+ bootPath = JavaPlatformManager.getDefault().getDefaultPlatform().getBootstrapLibraries(); -+ -+ final ClassIndex ci = ClasspathInfo.create(bootPath, compilePath, sourcePath).getClassIndex(); -+ Set> result; -+ result = ci.getDeclaredTypes("TestLib", NameKind.PREFIX, Set.of(ClassIndex.SearchScope.DEPENDENCIES)); -+ assertElementHandles(new String[] {}, result); -+ -+ GlobalPathRegistry.getDefault().register(ClassPath.BOOT, new ClassPath[] {bootPath}); -+ GlobalPathRegistry.getDefault().register(ClassPath.COMPILE, new ClassPath[] {compilePath}); -+ GlobalPathRegistry.getDefault().register(ClassPath.SOURCE, new ClassPath[] {sourcePath}); -+ -+ IndexingManager.getDefault().refreshAllIndices(true, true, root); -+ SourceUtils.waitScanFinished(); -+ -+ result = ci.getDeclaredTypes("TestLib", NameKind.PREFIX, Set.of(ClassIndex.SearchScope.DEPENDENCIES)); -+ assertNotNull(result); -+ assertElementHandles(new String[] {"lib.TestLib"}, result); -+ } -+ - private FileObject createJavaFile ( - final FileObject root, - final String pkg, diff --git a/patches/8260.diff b/patches/8260.diff deleted file mode 100644 index cf49878..0000000 --- a/patches/8260.diff +++ /dev/null @@ -1,549 +0,0 @@ -diff --git a/java/java.openjdk.project/nbproject/project.properties b/java/java.openjdk.project/nbproject/project.properties -index 9e592633d479..a785a66d13dd 100644 ---- a/java/java.openjdk.project/nbproject/project.properties -+++ b/java/java.openjdk.project/nbproject/project.properties -@@ -16,7 +16,7 @@ - # specific language governing permissions and limitations - # under the License. - # --javac.source=1.8 -+javac.release=17 - javac.compilerargs=-Xlint -Xlint:-serial - cp.extra=${tools.jar} - requires.nb.javac=true -diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/common/ShortcutUtils.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/common/ShortcutUtils.java -index fa2842cf88d6..2194ccb4b2fd 100644 ---- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/common/ShortcutUtils.java -+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/common/ShortcutUtils.java -@@ -89,6 +89,10 @@ public boolean shouldUseCustomTest(String repoName, String pathInRepo) { - } - - private boolean matches(String repoName, String pathInRepo, String key) { -+ if (pathInRepo == null) { -+ return false; -+ } -+ - String include = null; - String exclude = null; - try { -diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java -index 31e95ffdc6fa..5772df63938c 100644 ---- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java -+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java -@@ -36,7 +36,10 @@ - import java.util.regex.Pattern; - - import org.netbeans.api.java.classpath.ClassPath; -+import org.netbeans.api.java.lexer.JavaTokenId; - import org.netbeans.api.java.source.JavaSource; -+import org.netbeans.api.lexer.TokenHierarchy; -+import org.netbeans.api.lexer.TokenSequence; - import org.netbeans.api.project.libraries.Library; - import org.netbeans.api.project.libraries.LibraryManager; - import org.netbeans.api.queries.FileEncodingQuery; -@@ -142,31 +145,27 @@ public ClassPath findClassPath(FileObject file, String type) { - } else { - if (file.isFolder()) return null; - -- roots.add(file.getParent()); -- try (Reader r = new InputStreamReader(file.getInputStream(), FileEncodingQuery.getEncoding(file))) { -- StringBuilder content = new StringBuilder(); -- int read; -- -- while ((read = r.read()) != (-1)) { -- content.append((char) read); -- } -+ String content = getFileContent(file); - -+ try { - Pattern library = Pattern.compile("@library (.*)\n"); - Matcher m = library.matcher(content.toString()); - - if (m.find()) { - List libDirs = new ArrayList<>(); -- try (InputStream in = testRootFile.getInputStream()) { -- Properties p = new Properties(); -- p.load(in); -- String externalLibRoots = p.getProperty("external.lib.roots"); -- if (externalLibRoots != null) { -- for (String extLib : externalLibRoots.split("\\s+")) { -- FileObject libDir = BuildUtils.getFileObject(testRoot, extLib); -- -- if (libDir != null) { -- libDirs.add(libDir); -- } -+ Properties p = new Properties(); -+ if (testRootFile != null) { -+ try (InputStream in = testRootFile.getInputStream()) { -+ p.load(in); -+ } -+ } -+ String externalLibRoots = p.getProperty("external.lib.roots"); -+ if (externalLibRoots != null) { -+ for (String extLib : externalLibRoots.split("\\s+")) { -+ FileObject libDir = BuildUtils.getFileObject(testRoot, extLib); -+ -+ if (libDir != null) { -+ libDirs.add(libDir); - } - } - } -@@ -185,6 +184,20 @@ public ClassPath findClassPath(FileObject file, String type) { - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } -+ -+ String pckge = ""; -+ -+ pckge = packageClause(content); -+ -+ FileObject packageDir = file.getParent(); -+ -+ if (!pckge.isEmpty()) { -+ for (String s : pckge.split("\\.")) { -+ packageDir = packageDir.getParent(); -+ } -+ } -+ -+ roots.add(packageDir); - } - - //XXX: -@@ -203,6 +216,44 @@ private FileObject resolve(FileObject file, FileObject root, String spec) { - } - } - -+ private String getFileContent(FileObject file) { -+ try (Reader r = new InputStreamReader(file.getInputStream(), FileEncodingQuery.getEncoding(file))) { -+ StringBuilder contentBuilder = new StringBuilder(); -+ int read; -+ -+ while ((read = r.read()) != (-1)) { -+ contentBuilder.append((char) read); -+ } -+ -+ return contentBuilder.toString(); -+ } catch (IOException ex) { -+ Exceptions.printStackTrace(ex); -+ return ""; -+ } -+ } -+ -+ private String packageClause(String fileContent) { -+ TokenSequence ts = -+ TokenHierarchy.create(fileContent, JavaTokenId.language()) -+ .tokenSequence(JavaTokenId.language()); -+ while (ts.moveNext()) { -+ if (ts.token().id() == JavaTokenId.PACKAGE) { -+ StringBuilder pckge = new StringBuilder(); -+ -+ while (ts.moveNext()) { -+ switch (ts.token().id()) { -+ case IDENTIFIER, DOT -> pckge.append(ts.token().text()); -+ case BLOCK_COMMENT, JAVADOC_COMMENT, WHITESPACE, -+ JAVADOC_COMMENT_LINE_RUN, LINE_COMMENT -> {} -+ default -> {return pckge.toString();} -+ } -+ } -+ } -+ } -+ -+ return ""; -+ } -+ - private void initializeUsagesQuery(FileObject root) { - try { - ClassLoader cl = JavaSource.class.getClassLoader(); -diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/TestRootDescription.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/TestRootDescription.java -index 20a0a812e6c4..9356af3fc860 100644 ---- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/TestRootDescription.java -+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/TestRootDescription.java -@@ -46,6 +46,11 @@ public static TestRootDescription findRootDescriptionFor(FileObject file) { - if (testRoot != null) { - return new TestRootDescription(testProperties, search, testRoot); - } -+ -+ if (search.getNameExt().equals("lib") && search.getFileObject("../jdk/TEST.ROOT") != null) { -+ return new TestRootDescription(null, search, null); -+ } -+ - search = search.getParent(); - } - -diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/JDKProject.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/JDKProject.java -index 4e98d449e2e9..3a4596293bf6 100644 ---- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/JDKProject.java -+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/JDKProject.java -@@ -197,10 +197,11 @@ public JDKProject(FileObject projectDir, @NullAllowed ModuleRepository moduleRep - roots.clear(); - roots.addAll(newRoots); - } -- String testRoots = moduleRepository.moduleTests(currentModule.name); - -- if (testRoots != null) { -- addRoots(RootKind.TEST_SOURCES, Arrays.asList(Pair.of(testRoots, null))); -+ List testRoots = moduleRepository.moduleTests(currentModule.name); -+ -+ for (String testRoot : testRoots) { -+ addRoots(RootKind.TEST_SOURCES, Arrays.asList(Pair.of(testRoot, null))); - } - - } -diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java -index 0a9cd27ca0de..edc24316b705 100644 ---- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java -+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java -@@ -411,20 +411,45 @@ private boolean validate(FileObject repo, FileObject project) { - return true; - } - -- public String moduleTests(String moduleName) { -- String open = explicitOpen ? "open/" : ""; -- //TODO? for now, tests are assigned to java.base, java.compiler and java.xml, depending on the location of the tests: -- switch (moduleName) { -- case "java.base": -- return consolidatedRepository ? "${jdkRoot}/" + open + "test/jdk/" : "${jdkRoot}/jdk/test/"; -- case "java.compiler": -- return consolidatedRepository ? "${jdkRoot}/test/" + open + "langtools/" : "${jdkRoot}/langtools/test/"; -- case "java.xml": -- return consolidatedRepository ? "${jdkRoot}/test/" + open + "jaxp/" : "${jdkRoot}/jaxp/test/"; -- case "jdk.scripting.nashorn": -- return consolidatedRepository ? "${jdkRoot}/test/" + open + "nashorn/" : "${jdkRoot}/nashorn/test/"; -+ public List moduleTests(String moduleName) { -+ if (!consolidatedRepository) { -+ switch (moduleName) { -+ case "java.base": -+ return List.of("${jdkRoot}/jdk/test/"); -+ case "java.compiler": -+ return List.of("${jdkRoot}/langtools/test/"); -+ case "java.xml": -+ return List.of("${jdkRoot}/jaxp/test/"); -+ case "jdk.scripting.nashorn": -+ return List.of("${jdkRoot}/nashorn/test/"); -+ } -+ return List.of(); - } -- return null; -+ -+ List result = new ArrayList<>(); -+ -+ for (String dir : explicitOpen ? new String[] {"open/", "closed/"} -+ : new String[] {""}) { -+ //TODO? for now, tests are assigned to java.base, java.compiler and java.xml, depending on the location of the tests: -+ switch (moduleName) { -+ case "java.base": -+ result.add("${jdkRoot}/" + dir + "test/jdk/"); -+ result.add("${jdkRoot}/" + dir + "test/hotspot/"); -+ result.add("${jdkRoot}/" + dir + "test/lib/"); -+ break; -+ case "java.compiler": -+ result.add("${jdkRoot}/" + dir + "test/langtools/"); -+ break; -+ case "java.xml": -+ result.add("${jdkRoot}/" + dir + "test/jaxp/"); -+ break; -+ case "jdk.scripting.nashorn": -+ result.add("${jdkRoot}/" + dir + "test/nashorn/"); -+ break; -+ } -+ } -+ -+ return result; - } - - public Collection allDependencies(ModuleDescription module) { -diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/SourcesImpl.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/SourcesImpl.java -index a8b617ddae21..c9abc8655831 100644 ---- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/SourcesImpl.java -+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/SourcesImpl.java -@@ -63,9 +63,12 @@ public class SourcesImpl implements Sources, FileChangeListener, ChangeListener - public static final String SOURCES_TYPE_JDK_PROJECT_TESTS = "jdk-project-sources-tests"; - public static final String SOURCES_TYPE_JDK_PROJECT_NATIVE = "jdk-project-sources-native"; - -+ @SuppressWarnings("this-escape") - private final ChangeSupport cs = new ChangeSupport(this); - private final JDKProject project; -- private final Map root2SourceGroup = new HashMap(); -+ private final Map root2SourceGroup = new HashMap<>(); -+ private final Map> key2SourceGroups = new HashMap<>(); -+ private final Set seen = new HashSet<>(); - - public SourcesImpl(JDKProject project) { - this.project = project; -@@ -75,48 +78,83 @@ public SourcesImpl(JDKProject project) { - } - } - -- private boolean initialized; -- private final Map> key2SourceGroups = new HashMap<>(); -+ private int changeCount = 0; -+ private int changeCountForCurrentValues = -1; - - @Override -- public synchronized SourceGroup[] getSourceGroups(String type) { -- if (!initialized) { -- recompute(); -- initialized = true; -- } -- -- List groups = key2SourceGroups.get(type); -- if (groups != null) -- return groups.toArray(new SourceGroup[0]); -+ public SourceGroup[] getSourceGroups(String type) { -+ while (true) { -+ int currentChangeCount; -+ Map root2SourceGroupsCopy; - -- return new SourceGroup[0]; -+ synchronized (this) { -+ currentChangeCount = changeCount; -+ -+ if (changeCountForCurrentValues == currentChangeCount) { -+ return key2SourceGroups.getOrDefault(type, List.of()) -+ .toArray(SourceGroup[]::new); -+ } -+ -+ root2SourceGroupsCopy = new HashMap<>(root2SourceGroup); -+ } -+ -+ RecomputeResult recomputed = recompute(project, root2SourceGroupsCopy); -+ -+ synchronized (this) { -+ if (currentChangeCount == changeCount) { -+ //no intervening change, apply results: -+ root2SourceGroup.clear(); -+ root2SourceGroup.putAll(recomputed.root2SourceGroup()); -+ key2SourceGroups.clear(); -+ key2SourceGroups.putAll(recomputed.key2SourceGroups()); -+ -+ Set added = new HashSet<>(recomputed.seen()); -+ added.removeAll(seen); -+ Set removed = new HashSet<>(seen); -+ removed.removeAll(recomputed.seen()); -+ -+ for (File a : added) { -+ FileUtil.addFileChangeListener(this, a); -+ seen.add(a); -+ FileOwnerQuery.markExternalOwner(Utilities.toURI(a), null, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT); -+ FileOwnerQuery.markExternalOwner(Utilities.toURI(a), project, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT); -+ } -+ for (File r : removed) { -+ FileUtil.removeFileChangeListener(this, r); -+ seen.remove(r); -+ FileOwnerQuery.markExternalOwner(Utilities.toURI(r), null, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT); -+ } -+ -+ changeCountForCurrentValues = currentChangeCount; -+ return key2SourceGroups.getOrDefault(type, List.of()) -+ .toArray(SourceGroup[]::new); -+ } -+ } -+ } - } - -- private final Set seen = new HashSet<>(); - -- private synchronized void recompute() { -- key2SourceGroups.clear(); -+ private static RecomputeResult recompute(JDKProject project, Map root2SourceGroup) { -+ Map> key2SourceGroups = new HashMap<>(); -+ Set seen = new HashSet<>(); - - for (SourceGroup sg : GenericSources.genericOnly(project).getSourceGroups(TYPE_GENERIC)) { -- addSourceGroup(TYPE_GENERIC, sg); -+ addSourceGroup(key2SourceGroups, TYPE_GENERIC, sg); - } - -- Set newFiles = new HashSet<>(); - for (Root root : project.getRoots()) { - URL srcURL = root.getLocation(); - - if ("file".equals(srcURL.getProtocol())) { - try { -- newFiles.add(Utilities.toFile(srcURL.toURI())); -+ seen.add(Utilities.toFile(srcURL.toURI())); - } catch (URISyntaxException ex) { - Exceptions.printStackTrace(ex); - } - } - - FileObject src = URLMapper.findFileObject(srcURL); -- if (src == null) { -- root2SourceGroup.remove(root); -- } else { -+ if (src != null) { - SourceGroup sg = root2SourceGroup.get(root); - - if (sg == null) { -@@ -126,41 +164,27 @@ private synchronized void recompute() { - } - - if (root.kind == RootKind.NATIVE_SOURCES) { -- addSourceGroup(SOURCES_TYPE_JDK_PROJECT_NATIVE, sg); -+ addSourceGroup(key2SourceGroups, SOURCES_TYPE_JDK_PROJECT_NATIVE, sg); - } else { -- addSourceGroup(JavaProjectConstants.SOURCES_TYPE_JAVA, sg); -+ addSourceGroup(key2SourceGroups, JavaProjectConstants.SOURCES_TYPE_JAVA, sg); - } - - if (root.kind == RootKind.TEST_SOURCES) { -- addSourceGroup(SOURCES_TYPE_JDK_PROJECT_TESTS, sg); -+ addSourceGroup(key2SourceGroups, SOURCES_TYPE_JDK_PROJECT_TESTS, sg); - } - -- addSourceGroup(SOURCES_TYPE_JDK_PROJECT, sg); -+ addSourceGroup(key2SourceGroups, SOURCES_TYPE_JDK_PROJECT, sg); - - if (!FileUtil.isParentOf(project.getProjectDirectory(), src)) { -- addSourceGroup(TYPE_GENERIC, GenericSources.group(project, src, root.displayName, root.displayName, null, null)); -+ addSourceGroup(key2SourceGroups, TYPE_GENERIC, GenericSources.group(project, src, root.displayName, root.displayName, null, null)); - } - } - } -- Set added = new HashSet<>(newFiles); -- added.removeAll(seen); -- Set removed = new HashSet<>(seen); -- removed.removeAll(newFiles); -- for (File a : added) { -- FileUtil.addFileChangeListener(this, a); -- seen.add(a); -- FileOwnerQuery.markExternalOwner(Utilities.toURI(a), null, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT); -- FileOwnerQuery.markExternalOwner(Utilities.toURI(a), project, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT); -- } -- for (File r : removed) { -- FileUtil.removeFileChangeListener(this, r); -- seen.remove(r); -- FileOwnerQuery.markExternalOwner(Utilities.toURI(r), null, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT); -- } -- cs.fireChange(); -+ -+ return new RecomputeResult(root2SourceGroup, key2SourceGroups, seen); - } - -- private void addSourceGroup(String type, SourceGroup sg) { -+ private static void addSourceGroup(Map> key2SourceGroups, String type, SourceGroup sg) { - List groups = key2SourceGroups.get(type); - - if (groups == null) { -@@ -170,6 +194,7 @@ private void addSourceGroup(String type, SourceGroup sg) { - groups.add(sg); - } - -+ private record RecomputeResult(Map root2SourceGroup, Map> key2SourceGroups, Set seen) {} - @Override public void addChangeListener(ChangeListener listener) { - cs.addChangeListener(listener); - } -@@ -180,7 +205,7 @@ private void addSourceGroup(String type, SourceGroup sg) { - - @Override - public void fileFolderCreated(FileEvent fe) { -- recompute(); -+ changed(); - } - - @Override -@@ -191,12 +216,12 @@ public void fileChanged(FileEvent fe) { } - - @Override - public void fileDeleted(FileEvent fe) { -- recompute(); -+ changed(); - } - - @Override - public void fileRenamed(FileRenameEvent fe) { -- recompute(); -+ changed(); - } - - @Override -@@ -204,7 +229,14 @@ public void fileAttributeChanged(FileAttributeEvent fe) { } - - @Override - public void stateChanged(ChangeEvent e) { -- recompute(); -+ changed(); -+ } -+ -+ private void changed() { -+ synchronized (this) { -+ changeCount++; -+ } -+ cs.fireChange(); - } - - private static final class SourceGroupImpl implements SourceGroup { -diff --git a/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImplTest.java b/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImplTest.java -index 6ca6924302de..88c26c37ae01 100644 ---- a/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImplTest.java -+++ b/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImplTest.java -@@ -20,6 +20,7 @@ - - import java.io.File; - import java.io.IOException; -+import java.io.OutputStream; - import java.io.OutputStreamWriter; - import java.io.Writer; - import java.util.Arrays; -@@ -121,15 +122,59 @@ public void testExternalLibRoots() throws Exception { - new HashSet<>(Arrays.asList(sourceCP.getRoots()))); - } - -+ public void testInPackage() throws Exception { -+ File workDir = getWorkDir(); -+ -+ FileUtil.createFolder(new File(workDir, "src/share/classes")); -+ FileObject testRoot = createData("test/TEST.ROOT", ""); -+ FileObject testFile = FileUtil.createData(new File(workDir, "test/feature/pack/Test.java")); -+ writeContent(testFile, -+ """ -+ /* package wrong.package.clause; */ -+ @Ann("package another.wrong.package.clause") -+ package /**/ // -+ feature. -+ pack; -+ """); -+ ClassPath sourceCP = new ClassPathProviderImpl().findClassPath(testFile, ClassPath.SOURCE); -+ -+ Assert.assertArrayEquals(new FileObject[] {testFile.getParent().getParent().getParent()}, -+ sourceCP.getRoots()); -+ } -+ -+ public void testInFolder() throws Exception { -+ File workDir = getWorkDir(); -+ -+ FileUtil.createFolder(new File(workDir, "src/share/classes")); -+ FileObject testRoot = createData("test/jdk/TEST.ROOT", ""); -+ FileObject testFile = FileUtil.createData(new File(workDir, "test/lib/feature/pack/Test.java")); -+ writeContent(testFile, -+ """ -+ /* package wrong.package.clause; */ -+ @Ann("package another.wrong.package.clause") -+ package /**/ // -+ feature. -+ pack; -+ """); -+ ClassPath sourceCP = new ClassPathProviderImpl().findClassPath(testFile, ClassPath.SOURCE); -+ -+ Assert.assertArrayEquals(new FileObject[] {testFile.getParent().getParent().getParent()}, -+ sourceCP.getRoots()); -+ } -+ - private FileObject createData(String relPath, String content) throws IOException { - File workDir = getWorkDir(); - FileObject file = FileUtil.createData(new File(workDir, relPath)); - -+ writeContent(file, content); -+ -+ return file; -+ } -+ -+ private void writeContent(FileObject file, String content) throws IOException { - try (Writer w = new OutputStreamWriter(file.getOutputStream())) { - w.write(content); - } -- -- return file; - } - - } diff --git a/patches/8280.diff b/patches/8280.diff deleted file mode 100644 index 8b1c158..0000000 --- a/patches/8280.diff +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java -index 8d96ac88be89..ea6138764b46 100644 ---- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java -+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java -@@ -35,6 +35,7 @@ - import java.util.regex.Matcher; - import java.util.regex.Pattern; - import java.util.stream.Collectors; -+import javax.lang.model.element.ElementKind; - import javax.lang.model.element.TypeElement; - - import org.apache.commons.lang3.StringUtils; -@@ -206,15 +207,60 @@ public CompletableFuture launch(Map launchArguments, Debug - filePath = projectFilePath; - } - boolean preferProjActions = true; // True when we prefer project actions to the current (main) file actions. -- if (filePath == null || mainFilePath != null) { -- // main overides the current file -- preferProjActions = false; -- filePath = mainFilePath; -- } - FileObject file = null; - File nativeImageFile = null; - if (!isNative) { -- file = getFileObject(filePath); -+ if (filePath == null || mainFilePath != null) { -+ // main overides the current file -+ preferProjActions = false; -+ -+ file = getFileObject(mainFilePath); -+ -+ if (file == null) { -+ LspServerState state = Lookup.getDefault().lookup(LspServerState.class); -+ -+ if (state != null) { -+ for (FileObject workspaceFolder : state.getClientWorkspaceFolders()) { -+ file = workspaceFolder.getFileObject(mainFilePath); -+ -+ if (file != null) { -+ break; -+ } -+ } -+ -+ if (file == null) { -+ return state.openedProjects().thenCompose(prjs -> { -+ FileObject[] sourceRoots = -+ Arrays.stream(prjs) -+ .flatMap(p -> Arrays.stream(ProjectUtils.getSources(p).getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA))) -+ .map(sg -> sg.getRootFolder()) -+ .toArray(s -> new FileObject[s]); -+ -+ ClasspathInfo cpInfo = ClasspathInfo.create(ClassPath.EMPTY, ClassPath.EMPTY, ClassPathSupport.createClassPath(sourceRoots)); -+ FileObject mainClassFile = SourceUtils.getFile(ElementHandle.createTypeElementHandle(ElementKind.CLASS, mainFilePath), cpInfo); -+ if (mainClassFile == null) { -+ CompletableFuture currentResult = new CompletableFuture<>(); -+ ErrorUtilities.completeExceptionally(currentResult, -+ "The main class specified as: \"" + mainFilePath + "\" cannot be found as neither an absolute path, a path relative to any workspace folder or a class name.", -+ ResponseErrorCode.ServerNotInitialized); -+ return currentResult; -+ } else { -+ Map newLaunchArguments = new HashMap<>(launchArguments); -+ newLaunchArguments.put("mainClass", mainClassFile.toURI().toString()); -+ return launch(newLaunchArguments, context); -+ } -+ }); -+ } -+ } else { -+ ErrorUtilities.completeExceptionally(resultFuture, -+ "Failed to launch debuggee VM. Wrong context.", -+ ResponseErrorCode.ServerNotInitialized); -+ return resultFuture; -+ } -+ } -+ } else { -+ file = getFileObject(filePath); -+ } - if (file == null) { - ErrorUtilities.completeExceptionally(resultFuture, - "Missing file: " + filePath, -@@ -265,7 +311,7 @@ private static FileObject getFileObject(String filePath) { - try { - URI uri = new URI(filePath); - ioFile = Utilities.toFile(uri); -- } catch (URISyntaxException ex) { -+ } catch (URISyntaxException | IllegalArgumentException ex) { - // Not a valid file - } - } diff --git a/patches/8289.diff b/patches/8289.diff deleted file mode 100644 index bfe45fb..0000000 --- a/patches/8289.diff +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java -index ff0d0ea144..aef5606fb4 100644 ---- a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java -+++ b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java -@@ -30,6 +30,7 @@ import java.util.Collections; - import java.util.EnumSet; - import java.util.HashSet; - import java.util.List; -+import java.util.Locale; - import java.util.Map; - import java.util.Objects; - import java.util.Set; -@@ -87,6 +88,7 @@ public class MultiSourceRootProvider implements ClassPathProvider { - private static final Set MODULAR_DIRECTORY_OPTIONS = new HashSet<>(Arrays.asList( - "--module-path", "-p" - )); -+ private static final Set CLASSPATH_OPTIONS = Set.of("--class-path", "-cp", "-classpath"); - - //TODO: the cache will probably be never cleared, as the ClassPath/value refers to the key(?) - private Map file2SourceCP = new WeakHashMap<>(); -@@ -341,6 +343,19 @@ public class MultiSourceRootProvider implements ClassPathProvider { - - if (optionKeys.contains(currentOption)) { - for (String piece : parsed.get(i + 1).split(File.pathSeparator)) { -+ boolean hasStar = false; -+ boolean isClassPath = CLASSPATH_OPTIONS.contains(currentOption); -+ -+ if (isClassPath && piece.endsWith("*") && piece.length() > 1) { -+ char sep = piece.charAt(piece.length() - 2); -+ -+ if (sep == File.separatorChar || -+ sep == '/') { -+ hasStar = true; -+ piece = piece.substring(0, piece.length() - 2); -+ } -+ } -+ - File pieceFile = new File(piece); - - if (!pieceFile.isAbsolute()) { -@@ -367,6 +382,23 @@ public class MultiSourceRootProvider implements ClassPathProvider { - } else { - expandedPaths = Collections.emptyList(); - } -+ } else if (hasStar && isClassPath) { -+ if (!toRemoveFSListeners.remove(f.getAbsolutePath()) && -+ addedFSListeners.add(f.getAbsolutePath())) { -+ FileUtil.addFileChangeListener(this, f); -+ } -+ -+ File[] children = f.listFiles(); -+ -+ if (children != null) { -+ expandedPaths = Arrays.stream(children) -+ .filter(c -> c.getName() -+ .toLowerCase(Locale.ROOT) -+ .endsWith(".jar")) -+ .toList(); -+ } else { -+ expandedPaths = Collections.emptyList(); -+ } - } else { - expandedPaths = Arrays.asList(f); - } -diff --git a/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProviderTest.java b/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProviderTest.java -index c89798daad..0e98a5958f 100644 ---- a/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProviderTest.java -+++ b/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProviderTest.java -@@ -310,6 +310,48 @@ public class MultiSourceRootProviderTest extends NbTestCase { - assertSame(cp, provider.findClassPath(FileUtil.toFileObject(packDir), ClassPath.SOURCE)); - } - -+ public void testExpandClassPath() throws Exception { -+ FileObject wd = FileUtil.toFileObject(getWorkDir()); -+ FileObject test = FileUtil.createData(wd, "src/pack/Test1.java"); -+ FileObject libsDir = FileUtil.createFolder(wd, "libs"); -+ FileObject lib1Jar = FileUtil.createData(libsDir, "lib1.jar"); -+ FileObject lib2Jar = FileUtil.createData(libsDir, "lib2.jar"); -+ FileObject lib3Dir = FileUtil.createFolder(libsDir, "lib3"); -+ FileObject lib4Zip = FileUtil.createData(libsDir, "lib4.zip"); -+ -+ TestUtilities.copyStringToFile(test, "package pack;"); -+ -+ testResult.setOptions("--class-path " + FileUtil.getRelativePath(wd, libsDir) + "/*"); -+ testResult.setWorkDirectory(FileUtil.toFileObject(getWorkDir()).toURI()); -+ -+ MultiSourceRootProvider provider = new MultiSourceRootProvider(); -+ ClassPath compileCP = provider.findClassPath(test, ClassPath.COMPILE); -+ -+ assertEquals(new HashSet<>(Arrays.asList(FileUtil.getArchiveRoot(lib1Jar), -+ FileUtil.getArchiveRoot(lib2Jar))), -+ new HashSet<>(Arrays.asList(compileCP.getRoots()))); -+ -+ lib4Zip.delete(); -+ -+ assertEquals(new HashSet<>(Arrays.asList(FileUtil.getArchiveRoot(lib1Jar), -+ FileUtil.getArchiveRoot(lib2Jar))), -+ new HashSet<>(Arrays.asList(compileCP.getRoots()))); -+ -+ FileObject lib5Jar = FileUtil.createData(libsDir, "lib5.jar"); -+ -+ assertEquals(new HashSet<>(Arrays.asList(FileUtil.getArchiveRoot(lib1Jar), -+ FileUtil.getArchiveRoot(lib2Jar), -+ FileUtil.getArchiveRoot(lib5Jar))), -+ new HashSet<>(Arrays.asList(compileCP.getRoots()))); -+ -+ lib1Jar.delete(); -+ -+ assertEquals(new HashSet<>(Arrays.asList(FileUtil.getArchiveRoot(lib2Jar), -+ FileUtil.getArchiveRoot(lib5Jar))), -+ new HashSet<>(Arrays.asList(compileCP.getRoots()))); -+ -+ } -+ - @Override - protected void setUp() throws Exception { - super.setUp(); diff --git a/patches/8442-draft.diff b/patches/8442-draft.diff deleted file mode 100644 index cc8dede..0000000 --- a/patches/8442-draft.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java -index ae5f7fd6f8..db0dadefb1 100644 ---- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java -+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/RefactoringUtils.java -@@ -305,7 +305,7 @@ public class RefactoringUtils { - public static boolean isOnSourceClasspath(FileObject fo) { - Project pr = FileOwnerQuery.getOwner(fo); - if (pr == null) { -- return false; -+ return SourceLauncher.isSourceLauncherFile(fo); - } - - //workaround for 143542 diff --git a/patches/8470.diff b/patches/8470.diff deleted file mode 100644 index e0b0ae7..0000000 --- a/patches/8470.diff +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java -index a4c951ae8d8f..a8ca4f2143de 100644 ---- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java -+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java -@@ -129,7 +129,7 @@ protected void notifyFinished(DebugAdapterContext ctx, boolean success) { - - public final CompletableFuture nbLaunch(FileObject toRun, boolean preferProjActions, @NullAllowed File nativeImageFile, - @NullAllowed String method, @NullAllowed String nestedClassName, Map launchArguments, DebugAdapterContext context, -- boolean debug, boolean testRun, Consumer consoleMessages, -+ boolean debug, LaunchType launchType, Consumer consoleMessages, - boolean testInParallel) { - CompletableFuture launchFuture = new CompletableFuture<>(); - NbProcessConsole ioContext = new NbProcessConsole(consoleMessages); -@@ -200,7 +200,7 @@ public void close() throws IOException { - } - } - W writer = new W(); -- CompletableFuture> commandFuture = findTargetWithPossibleRebuild(prj, preferProjActions, toRun, singleMethod, nestedClass, debug, testRun, ioContext, testInParallel, projectFilter); -+ CompletableFuture> commandFuture = findTargetWithPossibleRebuild(prj, preferProjActions, toRun, singleMethod, nestedClass, debug, launchType, ioContext, testInParallel, projectFilter); - commandFuture.thenAccept((providerAndCommand) -> { - ExplicitProcessParameters params = createExplicitProcessParameters(launchArguments); - OperationContext ctx = OperationContext.find(Lookup.getDefault()); -@@ -512,8 +512,8 @@ static List argsToStringList(Object o) { - } - } - -- private static CompletableFuture> findTargetWithPossibleRebuild(Project proj, boolean preferProjActions, FileObject toRun, SingleMethod singleMethod, NestedClass nestedClass, boolean debug, boolean testRun, NbProcessConsole ioContext, boolean testInParallel, ContainedProjectFilter projectFilter) throws IllegalArgumentException { -- Pair providerAndCommand = findTarget(proj, preferProjActions, toRun, singleMethod, nestedClass, debug, testRun, testInParallel, projectFilter); -+ private static CompletableFuture> findTargetWithPossibleRebuild(Project proj, boolean preferProjActions, FileObject toRun, SingleMethod singleMethod, NestedClass nestedClass, boolean debug, LaunchType launchType, NbProcessConsole ioContext, boolean testInParallel, ContainedProjectFilter projectFilter) throws IllegalArgumentException { -+ Pair providerAndCommand = findTarget(proj, preferProjActions, toRun, singleMethod, nestedClass, debug, launchType, testInParallel, projectFilter); - if (providerAndCommand != null) { - return CompletableFuture.completedFuture(providerAndCommand); - } -@@ -529,7 +529,7 @@ protected void started() { - @Override - public void finished(boolean success) { - if (success) { -- Pair providerAndCommand = findTarget(proj, preferProjActions, toRun, singleMethod, nestedClass, debug, testRun, testInParallel, projectFilter); -+ Pair providerAndCommand = findTarget(proj, preferProjActions, toRun, singleMethod, nestedClass, debug, launchType, testInParallel, projectFilter); - if (providerAndCommand != null) { - afterBuild.complete(providerAndCommand); - return; -@@ -562,14 +562,16 @@ public void finished(boolean success) { - return afterBuild; - } - -- protected static @CheckForNull Pair findTarget(Project prj, boolean preferProjActions, FileObject toRun, SingleMethod singleMethod, NestedClass nestedClass, boolean debug, boolean testRun, boolean testInParallel, ContainedProjectFilter projectFilter) { -+ protected static @CheckForNull Pair findTarget(Project prj, boolean preferProjActions, FileObject toRun, SingleMethod singleMethod, NestedClass nestedClass, boolean debug, LaunchType launchType, boolean testInParallel, ContainedProjectFilter projectFilter) { - ClassPath sourceCP = ClassPath.getClassPath(toRun, ClassPath.SOURCE); -- FileObject fileRoot = sourceCP != null ? sourceCP.findOwnerRoot(toRun) : null; - boolean mainSource; -- if (fileRoot != null) { -- mainSource = UnitTestForSourceQuery.findUnitTests(fileRoot).length > 0; -+ if (launchType == LaunchType.RUN_MAIN) { -+ mainSource = true; -+ } else if (launchType == LaunchType.RUN_TEST) { -+ mainSource = false; - } else { -- mainSource = !testRun; -+ FileObject fileRoot = sourceCP != null ? sourceCP.findOwnerRoot(toRun) : null; -+ mainSource = fileRoot != null && UnitTestForSourceQuery.findUnitTests(fileRoot).length > 0; - } - ActionProvider provider = null; - String command = null; -@@ -723,4 +725,21 @@ private static Collection findNestedActionProviders(Project prj, - } - return actionProviders; - } -+ -+ public enum LaunchType { -+ AUTODETECT, -+ RUN_MAIN, -+ RUN_TEST; -+ -+ static LaunchType from(Map launchArguments) { -+ Object testRunValue = launchArguments.get("testRun"); -+ -+ if (testRunValue instanceof Boolean) { -+ Boolean testRunSetting = (Boolean) testRunValue; -+ return testRunSetting ? RUN_TEST : RUN_MAIN; -+ } else { -+ return AUTODETECT; -+ } -+ } -+ } - } -diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java -index ea6138764b46..b1a472ce99a4 100644 ---- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java -+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java -@@ -52,6 +52,7 @@ - import org.netbeans.modules.java.lsp.server.LspServerState; - import org.netbeans.modules.java.lsp.server.debugging.DebugAdapterContext; - import org.netbeans.modules.java.lsp.server.debugging.NbSourceProvider; -+import org.netbeans.modules.java.lsp.server.debugging.launch.NbLaunchDelegate.LaunchType; - import org.netbeans.modules.java.lsp.server.debugging.utils.ErrorUtilities; - import org.netbeans.spi.java.classpath.support.ClassPathSupport; - import org.openide.DialogDescriptor; -@@ -88,10 +89,10 @@ public CompletableFuture launch(Map launchArguments, Debug - String filePath = (String)launchArguments.get("file"); - String projectFilePath = (String)launchArguments.get("projectFile"); - String mainFilePath = (String)launchArguments.get("mainClass"); -- boolean testRun = (Boolean) launchArguments.getOrDefault("testRun", Boolean.FALSE); -+ LaunchType launchType = LaunchType.from(launchArguments); - - if (!isNative && (StringUtils.isBlank(mainFilePath) && StringUtils.isBlank(filePath) && StringUtils.isBlank(projectFilePath) -- || modulePaths.isEmpty() && classPaths.isEmpty()) && !testRun) { -+ || modulePaths.isEmpty() && classPaths.isEmpty()) && launchType != LaunchType.RUN_TEST) { - if (modulePaths.isEmpty() && classPaths.isEmpty()) { - ErrorUtilities.completeExceptionally(resultFuture, - "Failed to launch debuggee VM. Missing modulePaths/classPaths options in launch configuration.", -@@ -207,6 +208,8 @@ public CompletableFuture launch(Map launchArguments, Debug - filePath = projectFilePath; - } - boolean preferProjActions = true; // True when we prefer project actions to the current (main) file actions. -+ Object preferProj = launchArguments.get("project"); -+ if(preferProj instanceof Boolean) preferProjActions = (Boolean) preferProj; - FileObject file = null; - File nativeImageFile = null; - if (!isNative) { -@@ -293,7 +296,7 @@ public CompletableFuture launch(Map launchArguments, Debug - String singleMethod = (String)launchArguments.get("methodName"); - String nestedClass = (String)launchArguments.get("nestedClass"); - boolean testInParallel = (Boolean) launchArguments.getOrDefault("testInParallel", Boolean.FALSE); -- activeLaunchHandler.nbLaunch(file, preferProjActions, nativeImageFile, singleMethod, nestedClass, launchArguments, context, !noDebug, testRun, new OutputListener(context), testInParallel).thenRun(() -> { -+ activeLaunchHandler.nbLaunch(file, preferProjActions, nativeImageFile, singleMethod, nestedClass, launchArguments, context, !noDebug, launchType, new OutputListener(context), testInParallel).thenRun(() -> { - activeLaunchHandler.postLaunch(launchArguments, context); - resultFuture.complete(null); - }).exceptionally(e -> { diff --git a/patches/8484.diff b/patches/8484.diff deleted file mode 100644 index cda0229..0000000 --- a/patches/8484.diff +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/ide/editor.document/src/org/netbeans/api/editor/document/LineDocumentUtils.java b/ide/editor.document/src/org/netbeans/api/editor/document/LineDocumentUtils.java -index 5fb34c754a..247dda8b82 100644 ---- a/ide/editor.document/src/org/netbeans/api/editor/document/LineDocumentUtils.java -+++ b/ide/editor.document/src/org/netbeans/api/editor/document/LineDocumentUtils.java -@@ -30,7 +30,6 @@ import org.netbeans.lib.editor.util.swing.DocumentUtilities; - import org.netbeans.modules.editor.document.DocumentServices; - import org.netbeans.modules.editor.document.TextSearchUtils; - import org.netbeans.modules.editor.document.implspi.CharClassifier; --import org.netbeans.modules.editor.lib2.AcceptorFactory; - import org.netbeans.spi.editor.document.DocumentFactory; - import org.openide.util.Lookup; - -diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java -index 0e44783168..3202b2ac97 100644 ---- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java -+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java -@@ -2565,7 +2565,36 @@ public class Reformatter implements ReformatTask { - StatementTree elseStat = node.getElseStatement(); - CodeStyle.BracesGenerationStyle redundantIfBraces = cs.redundantIfBraces(); - int eoln = findNewlineAfterStatement(node); -- if ((elseStat != null && redundantIfBraces == CodeStyle.BracesGenerationStyle.ELIMINATE && danglingElseChecker.hasDanglingElse(node.getThenStatement())) || -+ Boolean hasErrThenStatement = node.getThenStatement() instanceof ExpressionStatementTree thenStatement -+ && thenStatement.getExpression() instanceof ErroneousTree; -+ if (hasErrThenStatement) { -+ if (getCurrentPath().getParentPath().getLeaf() instanceof BlockTree parentStTree) { -+ boolean isPreviousIfTree = false; -+ int endPositionOfErrThenStatement = endPos; -+ for (StatementTree statement : parentStTree.getStatements()) { -+ if (isPreviousIfTree) { -+ int startPositionOfNextErrorStatement = (int) sp.getStartPosition(getCurrentPath().getCompilationUnit(), statement); -+ endPositionOfErrThenStatement = startPositionOfNextErrorStatement; -+ break; -+ } else if (statement == node) { -+ isPreviousIfTree = true; -+ endPositionOfErrThenStatement = (int) sp.getEndPosition(getCurrentPath().getCompilationUnit(), parentStTree) - 1; -+ } -+ -+ } -+ if (isPreviousIfTree) { -+ while (tokens.offset() <= endPositionOfErrThenStatement && endPositionOfErrThenStatement != -1) { -+ tokens.moveNext(); -+ } -+ tokens.movePrevious(); -+ if (endPositionOfErrThenStatement != -1) { -+ endPos = endPositionOfErrThenStatement; -+ } -+ } -+ } -+ } -+ -+ if (hasErrThenStatement || (elseStat != null && redundantIfBraces == CodeStyle.BracesGenerationStyle.ELIMINATE && danglingElseChecker.hasDanglingElse(node.getThenStatement())) || - (redundantIfBraces == CodeStyle.BracesGenerationStyle.GENERATE && (startOffset > sp.getStartPosition(root, node) || endOffset < eoln || node.getCondition().getKind() == Tree.Kind.ERRONEOUS))) { - redundantIfBraces = CodeStyle.BracesGenerationStyle.LEAVE_ALONE; - } -diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java -index 8797b9111b..d5962a9ba3 100644 ---- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java -+++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java -@@ -1556,6 +1556,76 @@ public class FormatingTest extends NbTestCase { - preferences.putBoolean("specialElseIf", false); - reformat(doc, content, golden); - preferences.putBoolean("specialElseIf", true); -+ -+ content = """ -+ package hierbas.del.litoral; -+ class Test extends Integer implements Runnable, Serializable{ -+ public void run(){ -+ if ("foo".contains("bar"))))) ))) { -+ System.out.println("bar"); -+ } -+ } -+ } -+ """; -+ golden = """ -+ package hierbas.del.litoral; -+ -+ class Test extends Integer implements Runnable, Serializable { -+ -+ public void run() { -+ if ("foo".contains("bar"))))) ))) { -+ System.out.println("bar"); -+ } -+ } -+ } -+ """; -+ reformat(doc, content, golden); -+ -+ content = """ -+ package hierbas.del.litoral; -+ class Test extends Integer implements Runnable, Serializable{ -+ public void run(){ -+ if ("foo".contains("bar"))))) ))) -+ } -+ } -+ """; -+ golden = """ -+ package hierbas.del.litoral; -+ -+ class Test extends Integer implements Runnable, Serializable { -+ -+ public void run() { -+ if ("foo".contains("bar"))))) ))) -+ } -+ } -+ """; -+ reformat(doc, content, golden); -+ -+ content = """ -+ package hierbas.del.litoral; -+ class Test extends Integer implements Runnable, Serializable{ -+ public void run(){ -+ if ("foo".contains("bar"))))) ))) -+ else { -+ System.out.println("bar2") -+ } -+ } -+ } -+ """; -+ golden = """ -+ package hierbas.del.litoral; -+ -+ class Test extends Integer implements Runnable, Serializable { -+ -+ public void run() { -+ if ("foo".contains("bar"))))) ))) -+ else { -+ System.out.println("bar2") -+ } -+ } -+ } -+ """; -+ reformat(doc, content, golden); - } - - public void testWhile() throws Exception { diff --git a/patches/dev-dependency-licenses.diff b/patches/dev-dependency-licenses.diff index e52d548..33daf73 100644 --- a/patches/dev-dependency-licenses.diff +++ b/patches/dev-dependency-licenses.diff @@ -3,7 +3,7 @@ new file mode 100644 index 0000000000..db92c5cb72 --- /dev/null +++ b/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/assertion-error-1.1.0-license -@@ -0,0 +1,22 @@ +@@ -0,0 +1,21 @@ +(The MIT License) + +Copyright (c) 2013 Jake Luer (http://qualiancy.com) @@ -25,7 +25,6 @@ index 0000000000..db92c5cb72 +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. -+ diff --git a/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/eastasianwidth-0.2.0-license b/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/eastasianwidth-0.2.0-license new file mode 100644 index 0000000000..e8f4a01dd0 @@ -57,7 +56,7 @@ new file mode 100644 index 0000000000..14c83ad1c4 --- /dev/null +++ b/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/imurmurhash-0.1.4-license -@@ -0,0 +1,19 @@ +@@ -0,0 +1,18 @@ +Copyright (c) 2013 Gary Court, Jens Taylor + +Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -76,13 +75,12 @@ index 0000000000..14c83ad1c4 +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. -+ diff --git a/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/isarray-1.0.0-license b/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/isarray-1.0.0-license new file mode 100644 index 0000000000..ba21cfcb7d --- /dev/null +++ b/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/isarray-1.0.0-license -@@ -0,0 +1,22 @@ +@@ -0,0 +1,21 @@ +(MIT) + +Copyright (c) 2013 Julian Gruber <julian@juliangruber.com> @@ -104,7 +102,6 @@ index 0000000000..ba21cfcb7d +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. -+ diff --git a/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/jszip-3.10.1-license b/nbbuild/misc/prepare-bundles/src/main/resources/org/netbeans/prepare/bundles/jszip-3.10.1-license new file mode 100644 index 0000000000..803b55c862 diff --git a/patches/generate-dependencies.diff b/patches/generate-dependencies.diff index d2ed315..95de4d1 100644 --- a/patches/generate-dependencies.diff +++ b/patches/generate-dependencies.diff @@ -583,11 +583,11 @@ index 536df96b0e..8428268f51 100644 - licenseName = use.key + "-" + use.projects.stream().collect(Collectors.joining("-")); + + String projectsString = use.projects.stream().collect(Collectors.joining("-")); -+ ++ + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] hashBytes = digest.digest(projectsString.getBytes(StandardCharsets.UTF_8)); + String shasum = String.format("%064x", new BigInteger(1, hashBytes)); -+ ++ + licenseName = use.key + "-" + shasum; + try (OutputStream out = Files.newOutputStream(licensesDir.resolve(licenseName))) { diff --git a/patches/javavscode-375.diff b/patches/javavscode-375.diff deleted file mode 100644 index ca9edb0..0000000 --- a/patches/javavscode-375.diff +++ /dev/null @@ -1,62 +0,0 @@ ---- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java -+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java -@@ -19,6 +19,7 @@ - package org.netbeans.modules.java.lsp.server.protocol; - - import com.google.gson.Gson; -+import com.google.gson.JsonArray; - import com.google.gson.JsonElement; - import com.google.gson.JsonObject; - import com.google.gson.JsonPrimitive; -@@ -292,6 +293,8 @@ - private static final String NETBEANS_JAVADOC_LOAD_TIMEOUT = "javadoc.load.timeout";// NOI18N - private static final String NETBEANS_COMPLETION_WARNING_TIME = "completion.warning.time";// NOI18N - private static final String NETBEANS_JAVA_ON_SAVE_ORGANIZE_IMPORTS = "java.onSave.organizeImports";// NOI18N -+ private static final String NETBEANS_CODE_COMPLETION_COMMIT_CHARS = "java.completion.commit.chars";// NOI18N -+ - private static final String URL = "url";// NOI18N - private static final String INDEX = "index";// NOI18N - -@@ -368,6 +371,7 @@ - AtomicReference samplerRef = new AtomicReference<>(); - AtomicLong samplingStart = new AtomicLong(); - AtomicLong samplingWarningLength = new AtomicLong(DEFAULT_COMPLETION_WARNING_LENGTH); -+ AtomicReference> codeCompletionCommitChars = new AtomicReference<>(List.of()); - long completionStart = System.currentTimeMillis(); - COMPLETION_SAMPLER_WORKER.post(() -> { - if (!done.get()) { -@@ -412,7 +416,10 @@ - ConfigurationItem completionWarningLength = new ConfigurationItem(); - completionWarningLength.setScopeUri(uri); - completionWarningLength.setSection(client.getNbCodeCapabilities().getConfigurationPrefix() + NETBEANS_COMPLETION_WARNING_TIME); -- return client.configuration(new ConfigurationParams(Arrays.asList(conf, completionWarningLength))).thenApply(c -> { -+ ConfigurationItem commitCharacterConfig = new ConfigurationItem(); -+ commitCharacterConfig.setScopeUri(uri); -+ commitCharacterConfig.setSection(client.getNbCodeCapabilities().getConfigurationPrefix() + NETBEANS_CODE_COMPLETION_COMMIT_CHARS); -+ return client.configuration(new ConfigurationParams(Arrays.asList(conf, completionWarningLength, commitCharacterConfig))).thenApply(c -> { - if (c != null && !c.isEmpty()) { - if (c.get(0) instanceof JsonPrimitive) { - JsonPrimitive javadocTimeSetting = (JsonPrimitive) c.get(0); -@@ -424,7 +431,11 @@ - - samplingWarningLength.set(samplingWarningsLengthSetting.getAsLong()); - } -+ if(c.get(2) instanceof JsonArray){ -+ JsonArray commitCharsJsonArray = (JsonArray) c.get(2); -+ codeCompletionCommitChars.set(commitCharsJsonArray.asList().stream().map(ch -> ch.toString()).collect(Collectors.toList())); - } -+ } - final int caret = Utils.getOffset(doc, params.getPosition()); - List items = new ArrayList<>(); - Completion.Context context = params.getContext() != null -@@ -486,8 +497,8 @@ - }).collect(Collectors.toList())); - } - } -- if (completion.getCommitCharacters() != null) { -- item.setCommitCharacters(completion.getCommitCharacters().stream().map(ch -> ch.toString()).collect(Collectors.toList())); -+ if (codeCompletionCommitChars.get() != null) { -+ item.setCommitCharacters(codeCompletionCommitChars.get()); - } - lastCompletions.add(completion); - item.setData(new CompletionData(uri, index.getAndIncrement())); diff --git a/patches/nb-telemetry.diff b/patches/nb-telemetry.diff index be9accc..caa91d9 100644 --- a/patches/nb-telemetry.diff +++ b/patches/nb-telemetry.diff @@ -341,7 +341,7 @@ index d82646afb1..a4a1b53e26 100644 + previewEnabled = source != null && isPreviewEnabledForSource(source); + if (!previewEnabled) { + assert prj != null; -+ FileObject prjRoot = prj.getProjectDirectory(); ++ FileObject prjRoot = prj.getProjectDirectory(); + String relativePath = prjRoot == null ? null : FileUtil.getRelativePath(prjRoot, source); + if (relativePath == null || relativePath.isEmpty()) { + // The source is not inside the project root, and, @@ -462,7 +462,7 @@ index 9134992f5f..f070fec320 100644 * Secondary prefix for configuration. */ private String altConfigurationPrefix = "java+."; -+ ++ + /** + * Whether telemetry needs to be enabled. + */ diff --git a/vscode/package.json b/vscode/package.json index 8286579..8d4f5aa 100644 --- a/vscode/package.json +++ b/vscode/package.json @@ -248,13 +248,31 @@ "markdownDescription": "%jdk.configuration.telemetry.enabled.markdownDescription%", "default": false, "tags": [ - "telemetry" - ] + "telemetry" + ] }, "jdk.java.completion.commit.chars": { "type": "array", "default": [], "description": "%jdk.configuration.java.completion.commit.chars%" + }, + "jdk.inlay.enabled": { + "description": "%jdk.configuration.inlay.enabled.description%", + "type": "array", + "default": [], + "items": { + "type": "string", + "enum": [ + "chained", + "parameter", + "var" + ], + "markdownEnumDescriptions": [ + "%jdk.configuration.inlay.enabled.enum.chained.markdownDescription%", + "%jdk.configuration.inlay.enabled.enum.parameter.markdownDescription%", + "%jdk.configuration.inlay.enabled.enum.var.markdownDescription%" + ] + } } } }, diff --git a/vscode/package.nls.ja.json b/vscode/package.nls.ja.json index 6df1dbb..7bc09bb 100755 --- a/vscode/package.nls.ja.json +++ b/vscode/package.nls.ja.json @@ -69,5 +69,9 @@ "jdk.initialConfigurations.launchJavaApp.name": "Javaアプリケーションの起動", "jdk.configurationSnippets.name": "Javaアプリケーションの起動", "jdk.configurationSnippets.label": "Java+: Javaアプリケーションの起動", - "jdk.configurationSnippets.description": "デバッグ・モードでのJavaアプリケーションの起動" + "jdk.configurationSnippets.description": "デバッグ・モードでのJavaアプリケーションの起動", + "jdk.configuration.inlay.enabled.description": "Enable or disable various inline hints.", + "jdk.configuration.inlay.enabled.enum.chained.markdownDescription": "Show return types of chained methods", + "jdk.configuration.inlay.enabled.enum.parameter.markdownDescription": "Show parameter names", + "jdk.configuration.inlay.enabled.enum.var.markdownDescription": "Show types of `var` variables" } diff --git a/vscode/package.nls.json b/vscode/package.nls.json index 6730e1e..628d5b5 100644 --- a/vscode/package.nls.json +++ b/vscode/package.nls.json @@ -44,7 +44,7 @@ "jdk.configuration.serverVmOptions.description": "Specifies extra VM arguments used to launch the Java Language Server", "jdk.configuration.runConfig.env.description": "Environment variables", "jdk.configuration.runConfig.cwd.description": "Working directory", - "jdk.configuration.disableNbJavac.description": "Advanced option: disable nb-javac library, javac from the selected JDK will be used. The selected JDK must be at least JDK 24.", + "jdk.configuration.disableNbJavac.description": "Advanced option: disable nb-javac library, javac from the selected JDK will be used. The selected JDK must be at least JDK 25.", "jdk.configuration.disableProjectSearchLimit.description": "Advanced option: disable limits on searching in containing folders for project information.", "jdk.configuration.telemetry.enabled.description": "Allow the Oracle Java extension for Visual Studio Code (\"JVSCE\") to collect and send anonymous technical data commonly known as \"telemetry data\" to Oracle to help improve the Java platform. No personal information nor source code is collected. You may refer to the data collection and privacy policy for JVSCE at https://github.com/oracle/javavscode/blob/main/vscode/TELEMETRY.md", "jdk.configuration.telemetry.enabled.markdownDescription": "Allow the Oracle Java extension for Visual Studio Code (\"*JVSCE*\") to collect and send anonymous technical data commonly known as \"*telemetry data*\" to Oracle to help improve the Java platform. No personal information nor source code is collected. You may refer to the data collection and privacy policy for JVSCE at [TELEMETRY.md](https://github.com/oracle/javavscode/blob/main/vscode/TELEMETRY.md).", @@ -69,5 +69,9 @@ "jdk.initialConfigurations.launchJavaApp.name": "Launch Java App", "jdk.configurationSnippets.name": "Launch Java App", "jdk.configurationSnippets.label": "Java+: Launch Java Application", - "jdk.configurationSnippets.description": "Launch a Java Application in debug mode" + "jdk.configurationSnippets.description": "Launch a Java Application in debug mode", + "jdk.configuration.inlay.enabled.description": "Enable or disable various inline hints.", + "jdk.configuration.inlay.enabled.enum.chained.markdownDescription": "Show return types of chained methods", + "jdk.configuration.inlay.enabled.enum.parameter.markdownDescription": "Show parameter names", + "jdk.configuration.inlay.enabled.enum.var.markdownDescription": "Show types of `var` variables" } diff --git a/vscode/package.nls.zh-cn.json b/vscode/package.nls.zh-cn.json index 20f6f8f..64177b6 100755 --- a/vscode/package.nls.zh-cn.json +++ b/vscode/package.nls.zh-cn.json @@ -69,5 +69,9 @@ "jdk.initialConfigurations.launchJavaApp.name": "启动 Java 应用程序", "jdk.configurationSnippets.name": "启动 Java 应用程序", "jdk.configurationSnippets.label": "Java+：启动 Java 应用程序", - "jdk.configurationSnippets.description": "以调试模式启动 Java 应用程序" + "jdk.configurationSnippets.description": "以调试模式启动 Java 应用程序", + "jdk.configuration.inlay.enabled.description": "Enable or disable various inline hints.", + "jdk.configuration.inlay.enabled.enum.chained.markdownDescription": "Show return types of chained methods", + "jdk.configuration.inlay.enabled.enum.parameter.markdownDescription": "Show parameter names", + "jdk.configuration.inlay.enabled.enum.var.markdownDescription": "Show types of `var` variables" }