diff options
| author | Arseniy Pendryak <a.pendryak@yandex.ru> | 2021-09-22 13:47:29 +0300 |
|---|---|---|
| committer | Arseniy Pendryak <a.pendryak@yandex.ru> | 2021-09-22 15:25:38 +0300 |
| commit | 8fe30eb26e83aaa37e91c5803e7d2dd8f8f25f5d (patch) | |
| tree | ee98f031a883e25c56f08ed6425aea17c6626ec0 /grazie | |
| parent | 39d9968e2c5a91acde3cc4c988b8e183b7978472 (diff) | |
| download | intellij-rust-8fe30eb26e83aaa37e91c5803e7d2dd8f8f25f5d.tar.gz | |
Move code from 212 directory to common source set
Diffstat (limited to 'grazie')
4 files changed, 5 insertions, 20 deletions
diff --git a/grazie/src/212/main/resources/META-INF/platform-grazie-only.xml b/grazie/src/212/main/resources/META-INF/platform-grazie-only.xml deleted file mode 100644 index 3a9b530bc..000000000 --- a/grazie/src/212/main/resources/META-INF/platform-grazie-only.xml +++ /dev/null @@ -1,5 +0,0 @@ -<idea-plugin> - <extensions defaultExtensionNs="com.intellij.grazie"> - <disableChecking language="Rust"/> - </extensions> -</idea-plugin> diff --git a/grazie/src/212/test/kotlin/org/rust/grazie/compatUtils.kt b/grazie/src/212/test/kotlin/org/rust/grazie/compatUtils.kt deleted file mode 100644 index 7891a5346..000000000 --- a/grazie/src/212/test/kotlin/org/rust/grazie/compatUtils.kt +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Use of this source code is governed by the MIT license that can be - * found in the LICENSE file. - */ - -package org.rust.grazie - -import com.intellij.grazie.config.CheckingContext -import org.rust.lang.RsLanguage - -fun CheckingContext.withRsLanguageEnabled(): CheckingContext = copy(enabledLanguages = enabledLanguages + RsLanguage.id) diff --git a/grazie/src/main/resources/META-INF/grazie-only.xml b/grazie/src/main/resources/META-INF/grazie-only.xml index a84154c09..25afc5af2 100644 --- a/grazie/src/main/resources/META-INF/grazie-only.xml +++ b/grazie/src/main/resources/META-INF/grazie-only.xml @@ -1,9 +1,8 @@ -<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude"> +<idea-plugin> <depends>tanvd.grazi</depends> - <xi:include href="/META-INF/platform-grazie-only.xml" xpointer="xpointer(/idea-plugin/*)"/> - <extensions defaultExtensionNs="com.intellij.grazie"> <grammar.strategy language="Rust" implementationClass="org.rust.grazie.RsGrammarCheckingStrategy"/> + <disableChecking language="Rust"/> </extensions> </idea-plugin> diff --git a/grazie/src/test/kotlin/org/rust/grazie/RsGrammarCheckingTest.kt b/grazie/src/test/kotlin/org/rust/grazie/RsGrammarCheckingTest.kt index d4cd016ab..9247547fb 100644 --- a/grazie/src/test/kotlin/org/rust/grazie/RsGrammarCheckingTest.kt +++ b/grazie/src/test/kotlin/org/rust/grazie/RsGrammarCheckingTest.kt @@ -17,6 +17,7 @@ import com.intellij.testFramework.PlatformTestUtil import org.intellij.lang.annotations.Language import org.rust.ide.annotator.RsAnnotationTestFixture import org.rust.ide.inspections.RsInspectionsTestBase +import org.rust.lang.RsLanguage class RsGrammarCheckingTest : RsInspectionsTestBase(GrazieInspection::class) { @@ -29,10 +30,11 @@ class RsGrammarCheckingTest : RsInspectionsTestBase(GrazieInspection::class) { val currentState = GrazieConfig.get() if (strategy.getID() !in currentState.enabledGrammarStrategies || currentState.enabledLanguages != enabledLanguages) { updateSettings { state -> + val checkingContext = state.checkingContext state.copy( enabledGrammarStrategies = state.enabledGrammarStrategies + strategy.getID(), enabledLanguages = enabledLanguages, - checkingContext = state.checkingContext.withRsLanguageEnabled() + checkingContext = checkingContext.copy(enabledLanguages = checkingContext.enabledLanguages + RsLanguage.id) ) } } |