This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 4b3eb69878 Merge pull request #7236 from matthiasblaesing/jsf_composite_resources add 170c1e3275 JS: Enable parsing import.meta (meta property) in addition to new.target (already supported) add 86be3c42d9 JS: Ensure lexer and parser have similar interpretation of new.target and import.meta add bb2d43ffd2 JS: Provide model data for meta properties new.target and import.meta add 9766a6204c JS: Improve completion for property chain (obj.prop1.prop2) with embedded comments and new lines add 17685113f9 Merge pull request #7211 from matthiasblaesing/js-import-meta No new revisions were added by this update. Summary of changes: .../foreach/index.html.testForEach.completion | 2 + .../index.html.testForEachAlias.completion | 2 + .../index.html.testIssue231569.completion | 2 + .../template/index.html.testTemplate.completion | 2 + .../index.html.testTemplateForEach.completion | 2 + .../index.html.testTemplateInner.completion | 2 + .../completion/with/index.html.testWith.completion | 2 + .../nbproject/project.properties | 3 +- .../editor/CompletionContextFinder.java | 16 ++- .../classpath/MetaPropertiesModelContributor.java | 69 ++++++++++++ .../javascript2/editor/classpath/metaproperties.js | 56 ++++++++++ ...01.js.testOfferingCallbackFunction01.completion | 2 + .../constructors.js.testConstructors_01.completion | 2 + .../data/testfiles/completion/gh5919/gh5919_0.js | 20 ++++ .../gh5919/gh5919_0.js.testGH5919_0_1.completion | 6 + .../data/testfiles/completion/gh5919/gh5919_1.js | 23 ++++ .../gh5919/gh5919_1.js.testGH5919_1_1.completion | 5 + .../gh5919/gh5919_1.js.testGH5919_1_2.completion | 5 + .../gh5919/gh5919_1.js.testGH5919_1_3.completion | 6 + .../gh5919/gh5919_1.js.testGH5919_1_4.completion | 5 + .../gh5919_1.js.testGH5919_1_5.completion} | 5 +- .../gh5919/gh5919_1.js.testGH5919_1_6.completion | 5 + .../gh5919/gh5919_1.js.testGH5919_1_7.completion | 5 + .../data/testfiles/completion/gh5919/gh5919_2.js | 23 ++++ .../gh5919/gh5919_2.js.testGH5919_2_1.completion | 5 + .../gh5919/gh5919_2.js.testGH5919_2_2.completion | 5 + .../gh5919/gh5919_2.js.testGH5919_2_3.completion | 6 + .../gh5919/gh5919_2.js.testGH5919_2_4.completion | 5 + .../gh5919_2.js.testGH5919_2_5.completion} | 5 +- .../gh5919/gh5919_2.js.testGH5919_2_6.completion | 5 + .../gh5919/gh5919_2.js.testGH5919_2_7.completion | 5 + .../data/testfiles/completion/gh5919/gh5919_3.js | 23 ++++ .../gh5919/gh5919_3.js.testGH5919_3_1.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_2.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_3.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_4.completion | 6 + .../gh5919/gh5919_3.js.testGH5919_3_5.completion | 5 + .../gh5919_3.js.testGH5919_3_6.completion} | 5 +- .../gh5919/gh5919_3.js.testGH5919_3_7.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_8.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_9.completion | 5 + .../issue226650.html.testIssue226650.completion | 2 + .../issue232178.js.testIssue232178_01.completion | 2 + .../issue240914.js.testIssue240914_01.completion | 2 + .../issue240914.js.testIssue240914_04.completion | 2 + ...ssue254609Test.js.testIssue254609_01.completion | 1 + ...ferenceNew.js.testTypeInferenceNew01.completion | 2 + .../completion/with/with1.js.testWith1.completion | 2 + .../completion/with/with3.js.testWith3.completion | 2 + .../withAnonymous/with5.js.testWith5.completion | 2 + .../withComplex/with4.js.testWith4a.completion | 2 + .../withComplex/with4.js.testWith4b.completion | 2 + .../withComplex/with4.js.testWith4c.completion | 2 + .../ES6/meta-property/assign-new-target.js.ast.xml | 9 +- .../meta-property/import-meta-resolve-comment.js | 20 ++++ .../import-meta-resolve-comment.js.ast.xml | 57 ++++++++++ .../meta-property/import-meta-resolve-multiline.js | 24 ++++ ...ml => import-meta-resolve-multiline.js.ast.xml} | 53 +++++---- .../ES6/meta-property/import-meta-resolve.js | 20 ++++ .../meta-property/import-meta-resolve.js.ast.xml | 57 ++++++++++ .../parser/ES6/meta-property/import-meta-url.js | 20 ++++ ...ssion.js.ast.xml => import-meta-url.js.ast.xml} | 48 ++++---- .../ES6/meta-property/new-new-target.js.ast.xml | 9 +- .../new-target-declaration.js.ast.xml | 9 +- .../meta-property/new-target-expression.js.ast.xml | 9 +- .../ES6/meta-property/new-target-invoke.js.ast.xml | 9 +- .../meta-property/new-target-precedence.js.ast.xml | 9 +- .../issue232792.js.testCCinWith01.completion | 2 + .../issue234373.js.testIssue234373_02.completion | 2 + .../issue234381.js.testIssue234381_03.completion | 2 + .../editor/JsCodeCompletionIssueGH5919.java | 122 +++++++++++++++++++++ .../modules/javascript2/editor/parser/AstTest.java | 18 ++- .../jQueryFragment01.js.testProperty01.completion | 2 + .../test/unit/data/testfiles/metaproperties.js | 10 ++ .../data/testfiles/metaproperties.js.tokens.txt | 85 ++++++++++++++ .../modules/javascript2/lexer/JsTokenDumpTest.java | 6 + .../modules/javascript2/model/api/ModelUtils.java | 6 +- .../src/com/oracle/js/parser/Parser.java | 107 ++++++++++++++---- .../oracle/js/parser/resources/Messages.properties | 1 + .../src/com/oracle/js/parser/DumpingVisitor.java | 17 ++- .../unit/src/com/oracle/js/parser/ManualTest.java | 9 +- .../unit/src/com/oracle/js/parser/ParserTest.java | 21 ++++ 82 files changed, 1048 insertions(+), 113 deletions(-) create mode 100644 webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/classpath/MetaPropertiesModelContributor.java create mode 100644 webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/classpath/metaproperties.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_0.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_0.js.testGH5919_0_1.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js.testGH5919_1_1.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js.testGH5919_1_2.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js.testGH5919_1_3.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js.testGH5919_1_4.completion copy webcommon/javascript2.editor/test/unit/data/testfiles/completion/{issue254609/issue254609Test.js.testIssue254609_01.completion => gh5919/gh5919_1.js.testGH5919_1_5.completion} (58%) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js.testGH5919_1_6.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_1.js.testGH5919_1_7.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js.testGH5919_2_1.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js.testGH5919_2_2.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js.testGH5919_2_3.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js.testGH5919_2_4.completion copy webcommon/javascript2.editor/test/unit/data/testfiles/completion/{issue254609/issue254609Test.js.testIssue254609_01.completion => gh5919/gh5919_2.js.testGH5919_2_5.completion} (58%) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js.testGH5919_2_6.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_2.js.testGH5919_2_7.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_1.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_2.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_3.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_4.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_5.completion copy webcommon/javascript2.editor/test/unit/data/testfiles/completion/{issue254609/issue254609Test.js.testIssue254609_01.completion => gh5919/gh5919_3.js.testGH5919_3_6.completion} (58%) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_7.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_8.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/completion/gh5919/gh5919_3.js.testGH5919_3_9.completion create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/import-meta-resolve-comment.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/import-meta-resolve-comment.js.ast.xml create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/import-meta-resolve-multiline.js copy webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/{new-target-declaration.js.ast.xml => import-meta-resolve-multiline.js.ast.xml} (50%) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/import-meta-resolve.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/import-meta-resolve.js.ast.xml create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/import-meta-url.js copy webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/ES6/meta-property/{new-target-expression.js.ast.xml => import-meta-url.js.ast.xml} (54%) create mode 100644 webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsCodeCompletionIssueGH5919.java create mode 100644 webcommon/javascript2.lexer/test/unit/data/testfiles/metaproperties.js create mode 100644 webcommon/javascript2.lexer/test/unit/data/testfiles/metaproperties.js.tokens.txt --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists