Skip to content

Commit 86d9f39

Browse files
committed
Remove language settings panel
1 parent 4f92e0c commit 86d9f39

File tree

7 files changed

+5
-113
lines changed

7 files changed

+5
-113
lines changed

src/main/kotlin/io/runescript/plugin/ide/config/RsConfig.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package io.runescript.plugin.ide.config
22

3-
import com.intellij.ide.util.PropertiesComponent
4-
import com.intellij.openapi.project.Project
5-
63
object RsConfig {
74

85
private const val PRIMITIVE_TYPES_KEY = "runescript.settings.primitivetypes"
@@ -66,11 +63,7 @@ object RsConfig {
6663
"any"
6764
)
6865

69-
fun getPrimitiveTypes(project: Project?): List<String> {
66+
fun getPrimitiveTypes(): List<String> {
7067
return PRIMITIVE_TYPES_DEFAULT
7168
}
72-
73-
fun setPrimitiveTypes(project: Project, types: List<String>?) {
74-
PropertiesComponent.getInstance(project).setList(PRIMITIVE_TYPES_KEY, types)
75-
}
7669
}

src/main/kotlin/io/runescript/plugin/ide/configurable/RsLanguageSettings.kt

Lines changed: 0 additions & 96 deletions
This file was deleted.

src/main/kotlin/io/runescript/plugin/ide/highlight/RsSyntaxHighlighterFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ import io.runescript.plugin.lang.lexer.RsLexerInfo
1010
class RsSyntaxHighlighterFactory : SyntaxHighlighterFactory() {
1111

1212
override fun getSyntaxHighlighter(project: Project?, virtualFile: VirtualFile?): SyntaxHighlighter {
13-
return RsSyntaxHighlighter(RsLexerInfo(RsConfig.getPrimitiveTypes(project)))
13+
return RsSyntaxHighlighter(RsLexerInfo(RsConfig.getPrimitiveTypes()))
1414
}
1515
}

src/main/kotlin/io/runescript/plugin/lang/doc/parser/RsDocLinkParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class RsDocLinkParser : PsiParser {
3838
val builder = PsiBuilderFactory.getInstance().createBuilder(
3939
project,
4040
chameleon,
41-
RsLexerAdapter(RsLexerInfo(RsConfig.getPrimitiveTypes(project))),
41+
RsLexerAdapter(RsLexerInfo(RsConfig.getPrimitiveTypes())),
4242
root.language,
4343
chameleon.text
4444
)

src/main/kotlin/io/runescript/plugin/lang/parser/RsParserDefinition.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import io.runescript.plugin.lang.stubs.types.RsFileStubType
2424
class RsParserDefinition : ParserDefinition {
2525

2626
override fun createLexer(project: Project): Lexer {
27-
return RsLexerAdapter(RsLexerInfo(RsConfig.getPrimitiveTypes(project)))
27+
return RsLexerAdapter(RsLexerInfo(RsConfig.getPrimitiveTypes()))
2828
}
2929

3030
override fun createParser(project: Project): PsiParser {

src/main/kotlin/io/runescript/plugin/lang/stubs/types/RsFileStubType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object RsFileStubType : IStubFileElementType<RsFileStub>(RuneScript) {
2121
override fun doParseContents(chameleon: ASTNode, psi: PsiElement): ASTNode? {
2222
val project = psi.project
2323
val languageForParser = getLanguageForParser(psi)
24-
val lexer = RsLexerAdapter(RsLexerInfo(RsConfig.getPrimitiveTypes(project)))
24+
val lexer = RsLexerAdapter(RsLexerInfo(RsConfig.getPrimitiveTypes()))
2525
val builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, lexer, languageForParser, chameleon.chars)
2626
val host = InjectedLanguageManager.getInstance(project).getInjectionHost(psi)
2727
val node = if (host != null) {

src/main/resources/META-INF/plugin.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
implementationClass="io.runescript.plugin.ide.filetypes.RsFileType" fieldName="INSTANCE"
1515
extensions="cs2"/>
1616
<moduleBuilder builderClass="io.runescript.plugin.ide.projectWizard.RsModuleBuilder"/>
17-
<projectConfigurable
18-
groupId="language"
19-
id="runescript.languageSettings"
20-
displayName="RuneScript"
21-
instance="io.runescript.plugin.ide.configurable.RsLanguageSettings"/>
2217
<lang.syntaxHighlighterFactory language="RuneScript" implementationClass="io.runescript.plugin.ide.highlight.RsSyntaxHighlighterFactory"/>
2318
<colorSettingsPage implementation="io.runescript.plugin.ide.highlight.RsColorSettingsPage"/>
2419
<annotator language="RuneScript" implementationClass="io.runescript.plugin.ide.highlight.RsHighlightingAnnotator"/>

0 commit comments

Comments
 (0)