diff --git a/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/BracePairs.kt b/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/BracePairs.kt index 89c9387..2d2d9c8 100644 --- a/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/BracePairs.kt +++ b/src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/BracePairs.kt @@ -3,12 +3,17 @@ package com.github.izhangzhihao.rainbow.brackets import com.github.izhangzhihao.rainbow.brackets.provider.BracePairProvider import com.github.izhangzhihao.rainbow.brackets.util.memoize import com.intellij.codeInsight.highlighting.BraceMatchingUtil -import com.intellij.lang.* +import com.intellij.lang.BracePair +import com.intellij.lang.CompositeLanguage +import com.intellij.lang.Language +import com.intellij.lang.LanguageBraceMatching +import com.intellij.lang.LanguageExtension +import com.intellij.lang.PairedBraceMatcher import com.intellij.psi.tree.IElementType object BracePairs { - private val providers = LanguageExtension<BracePairProvider>("izhangzhihao.rainbow.brackets.bracePairProvider") + private val providers = LanguageExtension<BracePairProvider>("com.chylex.intellij.rainbowbrackets.bracePairProvider") private val bracePairs = Language.getRegisteredLanguages() @@ -74,4 +79,4 @@ inline val Language.bracePairs: MutableMap<String, MutableList<BracePair>>? get() = BracePairs.getBracePairs(this) inline val Language.braceTypeSet: Set<IElementType> - get() = BracePairs.braceTypeSet(this) \ No newline at end of file + get() = BracePairs.braceTypeSet(this) diff --git a/src/main/resources/META-INF/JSX.xml b/src/main/resources/META-INF/JSX.xml index c668d4f..ef44296 100644 --- a/src/main/resources/META-INF/JSX.xml +++ b/src/main/resources/META-INF/JSX.xml @@ -2,8 +2,8 @@ <extensions defaultExtensionNs="com.intellij"> <highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.ReactJSXRainbowVisitor"/> </extensions> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="JavaScript" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.TSBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/csharp-brackets.xml b/src/main/resources/META-INF/csharp-brackets.xml index 0da4435..2a45aaf 100644 --- a/src/main/resources/META-INF/csharp-brackets.xml +++ b/src/main/resources/META-INF/csharp-brackets.xml @@ -1,5 +1,5 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="C#" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.CSharpBracePairProvider"/> </extensions> @@ -7,4 +7,4 @@ <extensions defaultExtensionNs="com.intellij"> <highlightVisitor implementation="com.github.izhangzhihao.rainbow.brackets.visitor.CSharpRainbowVisitor"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/dart-brackets.xml b/src/main/resources/META-INF/dart-brackets.xml index 9f76ff9..6da4942 100644 --- a/src/main/resources/META-INF/dart-brackets.xml +++ b/src/main/resources/META-INF/dart-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="Dart" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.DartBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/go-template-brackets.xml b/src/main/resources/META-INF/go-template-brackets.xml index 425bd31..c02a113 100644 --- a/src/main/resources/META-INF/go-template-brackets.xml +++ b/src/main/resources/META-INF/go-template-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="GoTemplate" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.GoTemplateProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/groovy-brackets.xml b/src/main/resources/META-INF/groovy-brackets.xml index 1271ffe..dcd8681 100644 --- a/src/main/resources/META-INF/groovy-brackets.xml +++ b/src/main/resources/META-INF/groovy-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="Groovy" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.GroovyBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/kotlin-brackets.xml b/src/main/resources/META-INF/kotlin-brackets.xml index fa2848d..f346e0d 100644 --- a/src/main/resources/META-INF/kotlin-brackets.xml +++ b/src/main/resources/META-INF/kotlin-brackets.xml @@ -1,5 +1,5 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="kotlin" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.KotlinBracePairProvider"/> </extensions> @@ -9,4 +9,4 @@ <annotator language="kotlin" implementationClass="com.github.izhangzhihao.rainbow.brackets.annotator.KotlinLabelAnnotator"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/oc-brackets.xml b/src/main/resources/META-INF/oc-brackets.xml index d04fdf3..193b2d1 100644 --- a/src/main/resources/META-INF/oc-brackets.xml +++ b/src/main/resources/META-INF/oc-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="ObjectiveC" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.OCBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/php-brackets.xml b/src/main/resources/META-INF/php-brackets.xml index 06f1e87..56bcd7a 100644 --- a/src/main/resources/META-INF/php-brackets.xml +++ b/src/main/resources/META-INF/php-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="PHP" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.PHPBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 1c9b02d..25f9aaa 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,5 +1,5 @@ <idea-plugin require-restart="true"> - <id>izhangzhihao.rainbow.brackets</id> + <id>com.chylex.intellij.rainbowbrackets</id> <name>Rainbow Brackets</name> <vendor email="izhangzhihao@hotmail.com" url="https://github.com/izhangzhihao">izhangzhihao</vendor> diff --git a/src/main/resources/META-INF/sh-brackets.xml b/src/main/resources/META-INF/sh-brackets.xml index 4ee4754..29ea004 100644 --- a/src/main/resources/META-INF/sh-brackets.xml +++ b/src/main/resources/META-INF/sh-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="Shell Script" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.SHBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin> diff --git a/src/main/resources/META-INF/sql-brackets.xml b/src/main/resources/META-INF/sql-brackets.xml index 3bc2069..8e43c91 100644 --- a/src/main/resources/META-INF/sql-brackets.xml +++ b/src/main/resources/META-INF/sql-brackets.xml @@ -1,6 +1,6 @@ <idea-plugin> - <extensions defaultExtensionNs="izhangzhihao.rainbow.brackets"> + <extensions defaultExtensionNs="com.chylex.intellij.rainbowbrackets"> <bracePairProvider language="SQL" implementationClass="com.github.izhangzhihao.rainbow.brackets.provider.SqlBracePairProvider"/> </extensions> -</idea-plugin> \ No newline at end of file +</idea-plugin>