Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ pluginVersion = 0.1.1

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 223
pluginUntilBuild = 251.*
pluginUntilBuild = 253.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IC
platformVersion = 2024.3.3
platformVersion = 2024.1

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins = com.intellij.java, PsiViewer:243.7768
platformPlugins = com.intellij.java
#platformPlugins = com.intellij.java, PsiViewer:243.7768

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,7 @@ public Lexer createLexer(Project project) {
@NotNull
public PsiParser createParser(final Project project) {
final LibSLParser parser = new LibSLParser(null);
return new ANTLRParserAdaptor(LibSL.INSTANCE, parser) {
@Override
protected ParseTree parse(Parser parser, IElementType root) {
if (root instanceof IFileElementType) {
return ((LibSLParser) parser).file();
} else throw new UnsupportedOperationException("Wrong Lsl file structure");
}
};
return new LslParserAdaptor(LibSL.INSTANCE, parser);
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.github.kechinvv.libslpluginij.language;

import com.github.kechinvv.libslpluginij.antlr.LibSLParser;
import com.intellij.lang.Language;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IFileElementType;
import org.antlr.intellij.adaptor.parser.ANTLRParserAdaptor;
import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.tree.ParseTree;

public class LslParserAdaptor extends ANTLRParserAdaptor {
public LslParserAdaptor(Language language, Parser parser) {
super(language, parser);
}

@Override
protected ParseTree parse(Parser parser, IElementType root) {
if (root instanceof IFileElementType) {
return ((LibSLParser) parser).file();
} else throw new UnsupportedOperationException("Wrong Lsl file structure");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,13 @@ class LslPanel(val context: LslContext) : ModuleWizardStep() {
wizardContext: WizardContext
): Cell<TextFieldWithBrowseButton> {
//TODO: what happened with file choose descriptor?
// val fileChooserDescriptor =
// FileChooserDescriptorFactory.createSingleLocalFileDescriptor().withFileFilter { it.isDirectory }
val fileChosen = { file: VirtualFile -> getPresentablePath(file.path) }
val title = IdeBundle.message("title.select.project.file.directory", wizardContext.presentationName)
val fileChooserDescriptor =
FileChooserDescriptorFactory.createSingleLocalFileDescriptor().withFileFilter { it.isDirectory }
val fileChosen = { file: VirtualFile -> getPresentablePath(file.path) }
val property = locationProperty.transform(::getPresentablePath, ::getCanonicalPath)
return this.textFieldWithBrowseButton(title, wizardContext.project, fileChosen)
return textFieldWithBrowseButton(title, wizardContext.project, fileChooserDescriptor, fileChosen)
.bindText(property)

}

private fun getLocationComment(): @Nls String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json

class ActionHolderConverter : Converter<Map<String, ActionData>>() {
override fun toString(actions: Map<String, ActionData>): String {
return Json.encodeToString(actions)
override fun toString(value: Map<String, ActionData>): String {
return Json.encodeToString(value)
}

override fun fromString(actions: String): Map<String, ActionData> {
return Json.decodeFromString(actions) ?: emptyMap()
override fun fromString(value: String): Map<String, ActionData> {
return Json.decodeFromString(value) ?: emptyMap()
}
}