From a2a91cab5cfc32a112000224c1c9d95e77144936 Mon Sep 17 00:00:00 2001 From: Christian Vette <6884391+cvette@users.noreply.github.com> Date: Sun, 14 Apr 2024 00:51:27 +0200 Subject: [PATCH] feat: replace HtmlHighlightingLexer with HtmlLexer --- gradle.properties | 8 ++++---- .../idea/neos/lang/afx/parser/AfxHighlightingLexer.java | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index f7c081fd..712b1285 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ pluginName = neos-intellij-plugin pluginVersion = 1.20.1 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 231.1 +pluginSinceBuild = 233.* pluginUntilBuild = 241.* platformType = IU -platformVersion = 2023.1.6 +platformVersion = 2023.3 platformDownloadSources = true # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22IntelliLang -platformPlugins = org.intellij.intelliLang,com.intellij.css,com.jetbrains.hackathon.indices.viewer:1.23,PsiViewer:231-SNAPSHOT,yaml,java,java-i18n,properties,com.jetbrains.php:231.9414.10 -grammarKitVersion = 2022.3.1 +platformPlugins = org.intellij.intelliLang,com.intellij.css,com.jetbrains.hackathon.indices.viewer:1.25,PsiViewer:233.2,yaml,java,java-i18n,properties,com.jetbrains.php:233.11799.300 +grammarKitVersion = 2022.3.2 jFlexVersion = 1.9.0 javaVersion = 17 diff --git a/src/main/java/de/vette/idea/neos/lang/afx/parser/AfxHighlightingLexer.java b/src/main/java/de/vette/idea/neos/lang/afx/parser/AfxHighlightingLexer.java index 74f72b4c..84f52566 100644 --- a/src/main/java/de/vette/idea/neos/lang/afx/parser/AfxHighlightingLexer.java +++ b/src/main/java/de/vette/idea/neos/lang/afx/parser/AfxHighlightingLexer.java @@ -1,6 +1,7 @@ package de.vette.idea.neos.lang.afx.parser; import com.intellij.lexer.HtmlHighlightingLexer; +import com.intellij.lexer.HtmlLexer; import com.intellij.lexer.LayeredLexer; public class AfxHighlightingLexer extends LayeredLexer { @@ -9,9 +10,11 @@ public AfxHighlightingLexer() { } } -class BaseAfxHighlightingLexer extends HtmlHighlightingLexer { +class BaseAfxHighlightingLexer extends HtmlLexer { + + public BaseAfxHighlightingLexer() { - super(new InnerAfxLexer(), true, null); + super(new InnerAfxLexer(), true, true); } protected boolean isHtmlTagState(int state) {