Update html template syntax highlighting and html lexer on vue-gwt template files.

Author: Gijs

src/main/java/com/axellience/vuegwtplugin/language/htmltemplate/HtmlTemplateEmbeddedContentSupport.java

@@ -0,0 +1,16 @@
+package com.axellience.vuegwtplugin.language.htmltemplate;
+
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+import com.intellij.html.embedding.HtmlEmbeddedContentProvider;
+import com.intellij.html.embedding.HtmlEmbeddedContentSupport;
+import com.intellij.lexer.BaseHtmlLexer;
+import com.intellij.lexer.HtmlRawTextTagContentProvider;
+
+public class HtmlTemplateEmbeddedContentSupport implements HtmlEmbeddedContentSupport {
+
+  @NotNull @Override
+  public List<HtmlEmbeddedContentProvider> createEmbeddedContentProviders(@NotNull BaseHtmlLexer lexer) {
+    return List.of(new HtmlRawTextTagContentProvider(lexer), new HtmlVueGWTTemplateScriptStyleEmbeddedContentProvider(lexer));
+  }
+}

src/main/java/com/axellience/vuegwtplugin/language/htmltemplate/HtmlTemplateHandledLexer.java

@@ -1,6 +1,7 @@
 package com.axellience.vuegwtplugin.language.htmltemplate;
 
 import com.intellij.lang.html.HTMLParserDefinition;
+import com.intellij.lexer.HtmlLexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.FileViewProvider;
@@ -13,22 +14,20 @@
 
 public class HtmlTemplateParserDefinition extends HTMLParserDefinition {
 
-  private static final IFileElementType HTML_FILE =
-      new IStubFileElementType<PsiFileStub<HtmlFileImpl>>(HtmlTemplateLanguage.INSTANCE);
+  private static final IFileElementType HTML_FILE = new IStubFileElementType<PsiFileStub<HtmlFileImpl>>(HtmlTemplateLanguage.INSTANCE);
 
-  @Override
+  @NotNull @Override
   public IFileElementType getFileNodeType() {
     return HTML_FILE;
   }
 
-  @Override
-  public PsiFile createFile(FileViewProvider fileViewProvider) {
+  @NotNull @Override
+  public PsiFile createFile(@NotNull FileViewProvider fileViewProvider) {
     return new HtmlFileImpl(fileViewProvider, HTML_FILE);
   }
 
-  @NotNull
-  @Override
+  @NotNull @Override
   public Lexer createLexer(Project project) {
-    return new HtmlTemplateLexer();
+    return new HtmlLexer();
   }
 }

src/main/java/com/axellience/vuegwtplugin/language/htmltemplate/HtmlTemplateHighlightingLexer.java

@@ -0,0 +1,27 @@
+package com.axellience.vuegwtplugin.language.htmltemplate;
+
+import org.jetbrains.annotations.NotNull;
+import com.intellij.lang.Language;
+import com.intellij.lexer.BaseHtmlLexer;
+import com.intellij.lexer.HtmlScriptStyleEmbeddedContentProvider;
+
+public class HtmlVueGWTTemplateScriptStyleEmbeddedContentProvider extends HtmlScriptStyleEmbeddedContentProvider {
+
+  public HtmlVueGWTTemplateScriptStyleEmbeddedContentProvider(@NotNull BaseHtmlLexer lexer) {
+    super(lexer);
+  }
+
+  @Override
+  protected boolean isInterestedInAttribute(@NotNull CharSequence attributeName) {
+    return super.isInterestedInAttribute(attributeName) || namesEqual(attributeName, "lang");
+  }
+
+  @Override
+  protected Language styleLanguage(String styleLang) {
+    if ("scss".equals(styleLang)) {
+      return Language.findLanguageByID("SCSS");
+    }
+
+    return super.styleLanguage(styleLang);
+  }
+}

src/main/java/com/axellience/vuegwtplugin/language/htmltemplate/HtmlTemplateHighlightingLexerFactory.java

@@ -93,15 +93,18 @@
     <fileType name="VueGWT" implementationClass="com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateFileType"
               fieldName="INSTANCE" language="VueGWT-Template" extensions=""/>
 
+    <html.embeddedContentSupport
+            implementation="com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateEmbeddedContentSupport" />
+
     <lang.parserDefinition language="VueGWT-Template"
-      implementationClass="com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateParserDefinition"/>
+                           implementationClass="com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateParserDefinition"/>
+
+    <lang.syntaxHighlighterFactory language="VueGWT-Template"
+                                   implementationClass="com.intellij.lang.html.HtmlSyntaxHighlighterFactory"/>
 
     <annotator language="JAVA"
       implementationClass="com.axellience.vuegwtplugin.annotators.JavaComponentAnnotator"/>
 
-    <lang.syntaxHighlighterFactory language="VueGWT-Template"
-      implementationClass="com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateHighlightingLexerFactory"/>
-
     <completion.contributor
       language="any"
       id="VueGWTCompletionContributor"