This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 79a0572bfe50e11d795b235c3e6a93ea35f6a3ee Merge: 7202a4698dc d447e316002 Author: Matthias Bläsing <[email protected]> AuthorDate: Mon Jun 9 20:25:02 2025 +0200 Merge pull request #8401 from haidubogdan/t_javascript_vue_support_embedding_part vue files - include parametric embedding support for javascript and styles .../modules/css/lib/nbparser/CssParser.java | 28 +++++-- webcommon/javascript2.vue/nbproject/project.xml | 37 ++++++++++ .../javascript2/vue/editor/VueLanguage.java | 7 +- .../editor/embedding/VueCssEmbeddingProvider.java | 19 ++--- .../editor/embedding/VueHtmlEmbeddingProvider.java | 21 +++--- ...ngProvider.java => VueJsEmbeddingProvider.java} | 25 +++---- ...Provider.java => VueLessEmbeddingProvider.java} | 25 +++---- ...Provider.java => VueScssEmbeddingProvider.java} | 25 +++---- .../javascript2/vue/editor/lexer/VueLexer.java | 82 +++++++++++++++------ .../javascript2/vue/editor/lexer/VueTokenId.java | 39 ++++++---- .../antlr4/coloring/ColoringLexerAdaptor.java | 64 +++++++++++----- .../antlr4/coloring/VueAntlrColoringLexer.g4 | 68 ++++++++++++++--- .../modules/javascript2/vue/resources/vue16.png | Bin 3135 -> 3163 bytes .../data/testfiles/embedding/vue_embedding_01.vue | 45 +++++++++++ ...embedding_01.vue.testHtmlEmbedding_01.embedding | 33 +++++++++ ...e_embedding_01.vue.testJsEmbedding_01.embedding | 8 ++ .../testfiles/embedding/vue_less_embedding_01.vue | 38 ++++++++++ ...embedding_01.vue.testLessEmbedding_01.embedding | 8 ++ .../testfiles/embedding/vue_scss_embedding_01.vue | 48 ++++++++++++ ...embedding_01.vue.testScssEmbedding_01.embedding | 17 +++++ .../testfiles/lexer/vue/attribute_binding_01.vue | 20 +++++ .../lexer/vue/attribute_binding_01.vue.lexer | 33 ++++----- .../unit/data/testfiles/lexer/vue/component_01.vue | 20 +++++ .../testfiles/lexer/vue/component_01.vue.lexer | 57 +++++++------- .../testfiles/lexer/vue/javascript_pug_script.vue | 41 +++++++++++ .../lexer/vue/javascript_pug_script.vue.lexer | 11 +++ .../unit/data/testfiles/lexer/vue/template_01.vue | 20 +++++ .../data/testfiles/lexer/vue/template_01.vue.lexer | 20 ++--- .../data/testfiles/lexer/vue/user_input_01.vue | 20 +++++ .../testfiles/lexer/vue/user_input_01.vue.lexer | 53 ++++++------- .../javascript2/vue/editor/VueTestBase.java | 9 ++- .../vue/editor/embedding/EmbeddingTestBase.java | 53 +++++++++++++ .../VueHtmlEmbeddingProviderTest.java} | 29 +++----- .../VueJsEmbeddingProviderTest.java} | 32 ++++---- .../VueStyleEmbeddingProviderTest.java} | 37 +++++----- .../javascript2/vue/editor/lexer/VueLexerTest.java | 4 + .../VueTokenIdTest.java} | 38 +++------- 37 files changed, 829 insertions(+), 305 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
