This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 3e4b0ab2cc965ff9348ebea08be5ed47cb893b85
Merge: 98db1fe db2399b
Author: Jan Lahoda <lah...@gmail.com>
AuthorDate: Tue Mar 13 20:27:48 2018 +0100
Merge pull request #445 from apache/jdk18_3
Merge jdk18_3 ("var" support) branch to master
.../java/api/common/ui/PlatformUiSupport.java | 2 +-
java.completion/nbproject/project.xml | 4 +
.../java/completion/JavaCompletionTask.java | 26 +++-
.../JavaCompletionTaskTest/1.8/emptyVar.pass | 126 +++++++++++++++++++
.../JavaCompletionTaskTest/1.8/finalAndFWVar.pass | 2 +
.../1.8/resourcesAndAutoCloseablesFWVar.pass | 6 +
.../JavaCompletionTaskTest/1.8/varKeyword.pass | 2 +
.../JavaCompletionTaskTest/10/emptyVar.pass | 137 +++++++++++++++++++++
.../JavaCompletionTaskTest/10/varKeyword.pass | 2 +
.../java/completion/CompletionTestBase.java | 7 +-
.../JavaCompletionTask110FeaturesTest.java | 66 ++++++++++
.../JavaCompletionTask19FeaturesTest.java | 18 +--
.../modules/editor/java/GoToSupportTest.java | 41 ++++++
java.lexer/manifest.mf | 2 +-
.../org/netbeans/api/java/lexer/JavaTokenId.java | 2 +
.../src/org/netbeans/lib/java/lexer/JavaLexer.java | 79 +++++++++---
.../lib/java/lexer/JavaLexerBatchTest.java | 76 ++++++++++++
.../modules/java/source/PostFlowAnalysisTest.java | 2 +-
.../java/source/parsing/JavacParserTest.java | 5 +-
.../parsing/MRJARCachingFileManagerTest.java | 45 +++----
.../source/parsing/MRJARModuleFileManagerTest.java | 17 +--
libs.javacapi/external/binaries-list | 2 +-
libs.javacimpl/external/binaries-list | 2 +-
23 files changed, 602 insertions(+), 69 deletions(-)
--
To stop receiving notification emails like this one, please contact
jlah...@apache.org.
---------------------------------------------------------------------
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
