Merge pull request #5694 from matthiasblaesing/js_improvements2

JS: Static initializer blocks and "for await ... of ..."

webcommon/javascript2.editor/external/javascript2.editor-requirejs-2.1.14-license.txt → nbbuild/licenses/MIT-requirejs

@@ -1,10 +1,3 @@
-Name: javascript2.editor-requirejs-resources
-Version: 2.1.14
-Description: Testcase for issue #246060
-License: MIT
-Origin: https://github.com/requirejs/requirejs
-Files: javascript2.editor-requirejs-2.1.14-resources.zip
-
 The MIT License
 
 Copyright (c) 2010-2014, The Dojo Foundation

nbbuild/licenses/UPL-graaljs

@@ -0,0 +1,39 @@
+
+Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associated documentation and/or
+data (collectively the "Software"), free of charge and under any and all
+copyright rights in the Software, and any and all patent rights owned or
+freely licensable by each licensor hereunder covering either (i) the
+unmodified Software as contributed to or provided by such licensor, or (ii)
+the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+
+The above copyright notice and either this complete permission notice or at a
+minimum a reference to the UPL must be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

webcommon/javascript2.doc/nbproject/project.xml

@@ -39,8 +39,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.2</specification-version>
+                        <release-version>3</release-version>
+                        <specification-version>3.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

webcommon/javascript2.doc/test/unit/src/org/netbeans/modules/javascript2/doc/JsDocumentationTestBase.java

@@ -26,6 +26,7 @@
 import com.oracle.js.parser.ir.CallNode;
 import com.oracle.js.parser.ir.CaseNode;
 import com.oracle.js.parser.ir.CatchNode;
+import com.oracle.js.parser.ir.ClassElement;
 import com.oracle.js.parser.ir.ClassNode;
 import com.oracle.js.parser.ir.ContinueNode;
 import com.oracle.js.parser.ir.DebuggerNode;
@@ -151,207 +152,10 @@ public List<Node> getNodes() {
         }
 
         @Override
-        public boolean enterClassNode(ClassNode classNode) {
-            processNode(classNode);
-            return super.enterClassNode(classNode);
+        public boolean enterDefault(Node node) {
+            processNode(node);
+            return super.enterDefault(node);
         }
 
-        @Override
-        public boolean enterWithNode(WithNode withNode) {
-            processNode(withNode);
-            return super.enterWithNode(withNode);
-        }
-
-        @Override
-        public boolean enterWhileNode(WhileNode whileNode) {
-            processNode(whileNode);
-            return super.enterWhileNode(whileNode);
-        }
-
-        @Override
-        public boolean enterVarNode(VarNode varNode) {
-            processNode(varNode);
-            return super.enterVarNode(varNode);
-        }
-
-        @Override
-        public boolean enterJoinPredecessorExpression(JoinPredecessorExpression expr) {
-            processNode(expr);
-            return super.enterJoinPredecessorExpression(expr);
-        }
-
-        @Override
-        public boolean enterUnaryNode(UnaryNode unaryNode) {
-            processNode(unaryNode);
-            return super.enterUnaryNode(unaryNode);
-        }
-
-        @Override
-        public boolean enterTryNode(TryNode tryNode) {
-            processNode(tryNode);
-            return super.enterTryNode(tryNode);
-        }
-
-        @Override
-        public boolean enterThrowNode(ThrowNode throwNode) {
-            processNode(throwNode);
-            return super.enterThrowNode(throwNode);
-        }
-
-        @Override
-        public boolean enterTernaryNode(TernaryNode ternaryNode) {
-            processNode(ternaryNode);
-            return super.enterTernaryNode(ternaryNode);
-        }
-
-        @Override
-        public boolean enterSwitchNode(SwitchNode switchNode) {
-            processNode(switchNode);
-            return super.enterSwitchNode(switchNode);
-        }
-
-        @Override
-        public boolean enterRuntimeNode(RuntimeNode runtimeNode) {
-            processNode(runtimeNode);
-            return super.enterRuntimeNode(runtimeNode);
-        }
-
-        @Override
-        public boolean enterReturnNode(ReturnNode returnNode) {
-            processNode(returnNode);
-            return super.enterReturnNode(returnNode);
-        }
-
-        @Override
-        public boolean enterPropertyNode(PropertyNode propertyNode) {
-            processNode(propertyNode);
-            return super.enterPropertyNode(propertyNode);
-        }
-
-        @Override
-        public boolean enterObjectNode(ObjectNode objectNode) {
-            processNode(objectNode);
-            return super.enterObjectNode(objectNode);
-        }
-
-        @Override
-        public boolean enterLiteralNode(LiteralNode literalNode) {
-            processNode(literalNode);
-            return super.enterLiteralNode(literalNode);
-        }
-
-        @Override
-        public boolean enterLabelNode(LabelNode labelNode) {
-            processNode(labelNode);
-            return super.enterLabelNode(labelNode);
-        }
-
-        @Override
-        public boolean enterIndexNode(IndexNode indexNode) {
-            processNode(indexNode);
-            return super.enterIndexNode(indexNode);
-        }
-
-        @Override
-        public boolean enterIfNode(IfNode ifNode) {
-            processNode(ifNode);
-            return super.enterIfNode(ifNode);
-        }
-
-        @Override
-        public boolean enterIdentNode(IdentNode identNode) {
-            processNode(identNode);
-            return super.enterIdentNode(identNode);
-        }
-
-        @Override
-        public boolean enterFunctionNode(FunctionNode functionNode) {
-            processNode(functionNode);
-            return super.enterFunctionNode(functionNode);
-        }
-
-        @Override
-        public boolean enterForNode(ForNode forNode) {
-            processNode(forNode);
-            return super.enterForNode(forNode);
-        }
-
-        @Override
-        public boolean enterBlockStatement(BlockStatement blockStatement) {
-            processNode(blockStatement);
-            return super.enterBlockStatement(blockStatement);
-        }
-
-        @Override
-        public boolean enterExpressionStatement(ExpressionStatement expressionStatement) {
-            processNode(expressionStatement);
-            return super.enterExpressionStatement(expressionStatement);
-        }
-
-        @Override
-        public boolean enterErrorNode(ErrorNode errorNode) {
-            processNode(errorNode);
-            return super.enterErrorNode(errorNode);
-        }
-
-        @Override
-        public boolean enterEmptyNode(EmptyNode emptyNode) {
-            processNode(emptyNode);
-            return super.enterEmptyNode(emptyNode);
-        }
-
-        @Override
-        public boolean enterDebuggerNode(DebuggerNode debuggerNode) {
-            processNode(debuggerNode);
-            return super.enterDebuggerNode(debuggerNode);
-        }
-
-        @Override
-        public boolean enterContinueNode(ContinueNode continueNode) {
-            processNode(continueNode);
-            return super.enterContinueNode(continueNode);
-        }
-
-        @Override
-        public boolean enterCatchNode(CatchNode catchNode) {
-            processNode(catchNode);
-            return super.enterCatchNode(catchNode);
-        }
-
-        @Override
-        public boolean enterCaseNode(CaseNode caseNode) {
-            processNode(caseNode);
-            return super.enterCaseNode(caseNode);
-        }
-
-        @Override
-        public boolean enterCallNode(CallNode callNode) {
-            processNode(callNode);
-            return super.enterCallNode(callNode);
-        }
-
-        @Override
-        public boolean enterBreakNode(BreakNode breakNode) {
-            processNode(breakNode);
-            return super.enterBreakNode(breakNode);
-        }
-
-        @Override
-        public boolean enterBinaryNode(BinaryNode binaryNode) {
-            processNode(binaryNode);
-            return super.enterBinaryNode(binaryNode);
-        }
-
-        @Override
-        public boolean enterBlock(Block block) {
-            processNode(block);
-            return super.enterBlock(block);
-        }
-
-        @Override
-        public boolean enterAccessNode(AccessNode accessNode) {
-            processNode(accessNode);
-            return super.enterAccessNode(accessNode);
-        }
     }
 }

webcommon/javascript2.editor/build.xml

@@ -26,9 +26,6 @@
     <target name="build-init" depends="projectized.build-init">
         <mkdir dir="build/testfiles" />
         <unzip src="external/testfiles-jsdoc-1.zip" dest="build/testfiles"/>
-        <unzip src="external/js.foundation-parser-1.0.zip" dest="test/unit/data/testfiles/ecmascript6"/>
-        <unzip src="external/javascript2.editor-requirejs-2.1.14-resources.zip" dest="."/>
-        <unzip src="external/javascript2.editor-jquery-1.6-resources.zip" dest="."/>
     </target>
 </project>
 

webcommon/javascript2.editor/external/binaries-list

@@ -16,7 +16,4 @@
 # under the License.
 0F87C4B6A9BDBA295C208B27D702EA579ADB398D js-corestubs-ts4.6.3-1.zip
 A928BFAB03CE65A4B6145079C898266AA63E476A js-domstubs-ts4.6.3-1.zip
-80BB535015E97A53057FB93F56EF28FA427250DA js.foundation-parser-1.0.zip
-446050AD183530299346C725433F1C4F18244A65 javascript2.editor-jquery-1.6-resources.zip
-4A38917342E32B7979DF8A01AC6C2EF2F057675D javascript2.editor-requirejs-2.1.14-resources.zip
 BB4253C4D259414FAF66131EE6203A6CCEF78976 testfiles-jsdoc-1.zip