cleanup

tomblachut · Feb 23, 2020 · e18286d · e18286d
1 parent 6528d9b
commit e18286d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 127 deletions.
diff --git a/src/main/java/dev/blachut/svelte/lang/SvelteLanguage.java b/src/main/java/dev/blachut/svelte/lang/SvelteLanguage.java
diff --git a/src/main/java/dev/blachut/svelte/lang/parsing/top/Svelte.flex b/src/main/java/dev/blachut/svelte/lang/parsing/top/Svelte.flex
diff --git a/src/main/java/dev/blachut/svelte/lang/parsing/top/SvelteParserDefinition.kt b/src/main/java/dev/blachut/svelte/lang/parsing/top/SvelteParserDefinition.kt
diff --git a/src/main/java/dev/blachut/svelte/lang/psi/SvelteElementType.kt b/src/main/java/dev/blachut/svelte/lang/psi/SvelteElementType.kt
@@ -1,9 +1,9 @@
 package dev.blachut.svelte.lang.psi
 
 import com.intellij.psi.tree.IElementType
-import dev.blachut.svelte.lang.SvelteLanguage
+import dev.blachut.svelte.lang.SvelteHTMLLanguage
 import org.jetbrains.annotations.NonNls
 
-class SvelteElementType(@NonNls debugName: String) : IElementType(debugName, SvelteLanguage.INSTANCE)
+class SvelteElementType(@NonNls debugName: String) : IElementType(debugName, SvelteHTMLLanguage.INSTANCE)
 
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -60,8 +60,6 @@
         <internalFileTemplate name="Svelte Component"/>
         <lang.fileViewProviderFactory language="SvelteHTML"
                                       implementationClass="dev.blachut.svelte.lang.SvelteFileViewProviderFactory"/>
-        <lang.parserDefinition language="Svelte"
-                               implementationClass="dev.blachut.svelte.lang.parsing.top.SvelteParserDefinition"/>
         <lang.parserDefinition language="SvelteJS"
                                implementationClass="dev.blachut.svelte.lang.parsing.js.SvelteJSParserDefinition"/>
         <lang.parserDefinition language="SvelteHTML"
@@ -73,7 +71,7 @@
                            implementationClass="dev.blachut.svelte.lang.editor.SvelteBraceMatcher"/>
         <lang.syntaxHighlighterFactory language="SvelteHTML"
                                        implementationClass="dev.blachut.svelte.lang.SvelteSyntaxHighlighterFactory"/>
-        <!--        <lang.commenter language="Svelte" implementationClass="com.intellij.lang.xml.XmlCommenter"/>-->
+<!--        <lang.commenter language="SvelteHTML" implementationClass="com.intellij.lang.xml.XmlCommenter"/>-->
         <lang.foldingBuilder language="SvelteHTML"
                              implementationClass="dev.blachut.svelte.lang.editor.SvelteFoldingBuilder"/>
         <!--        <lang.formatter language="SvelteHTML" implementationClass="dev.blachut.svelte.lang.format.SvelteFormattingModelBuilder"/>-->

diff --git a/src/test/java/dev/blachut/svelte/lang/parsing/SvelteParsingTest.kt b/src/test/java/dev/blachut/svelte/lang/parsing/SvelteParsingTest.kt
@@ -5,7 +5,7 @@ import dev.blachut.svelte.lang.parsing.html.SvelteHTMLParserDefinition
 import dev.blachut.svelte.lang.parsing.js.SvelteJSParserDefinition
 import dev.blachut.svelte.lang.parsing.top.SvelteParserDefinition
 
-class SvelteParsingTest : ParsingTestCase("dev/blachut/svelte/lang/parsing", "svelte", SvelteParserDefinition(), SvelteJSParserDefinition(), SvelteHTMLParserDefinition()) {
+class SvelteParsingTest : ParsingTestCase("dev/blachut/svelte/lang/parsing", "svelte", SvelteJSParserDefinition(), SvelteHTMLParserDefinition()) {
     override fun getTestDataPath(): String = "src/test/resources"
 
     fun testIfElseIf() = doTest()