falsepattern/ZigBrains
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

backport: 20.0.4

Browse source
This commit is contained in:
FalsePattern 2024-11-28 13:42:25 +01:00
parent 2624002696
commit 814669b228
Signed by: falsepattern
GPG key ID: E930CDEC50C50E23
21 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -17,6 +17,12 @@ Changelog structure reference:
## [Unreleased]
## [20.0.4]
### Fixed
- Renamed Zig new file task to "Zig File" and moved to the file creation group
## [20.0.3]
### Fixed

2
cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/execution/binary/ZigConfigTypeBinary.kt
View file

@ -33,7 +33,7 @@ class ZigConfigTypeBinary: ConfigurationTypeBase(
IDENTIFIER,
ZigDebugBundle.message("configuration.binary.name"),
ZigDebugBundle.message("configuration.binary.description"),
Icons.ZIG
Icons.Zig
) {
init {
addFactory(ConfigFactoryBinary(this))

6
core/src/main/kotlin/com/falsepattern/zigbrains/Icons.kt
View file

@ -27,6 +27,8 @@ import org.jetbrains.annotations.NonNls
@NonNls
object Icons {
val ZIG = IconLoader.getIcon("/icons/zig.svg", Icons::class.java)
val ZON = IconLoader.getIcon("/icons/zon.svg", Icons::class.java)
@JvmField
val Zig = IconLoader.getIcon("/icons/zig.svg", Icons::class.java)
@JvmField
val Zon = IconLoader.getIcon("/icons/zon.svg", Icons::class.java)
}

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/actions/ZigNewFileAction.kt
View file

@ -31,7 +31,7 @@ import com.intellij.psi.PsiDirectory
class ZigNewFileAction: CreateFileFromTemplateAction() {
override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
builder.setTitle("Zig File")
.addKind("Empty file", Icons.ZIG, "blank_zig_file")
.addKind("Empty file", Icons.Zig, "blank_zig_file")
}
override fun getActionName(directory: PsiDirectory?, newName: String, templateName: String?): String {

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt
View file

@ -64,7 +64,7 @@ abstract class ZigProfileState<T: ZigExecConfig<T>> (
// TODO remove this check once JetBrains implements colored terminal in the debugger
// https://youtrack.jetbrains.com/issue/CPP-11622/ANSI-color-codes-not-honored-in-Debug-Run-Configuration-output-window
val cli = if (configuration.emulateTerminal() && !debug) PtyCommandLine() else GeneralCommandLine()
val cli = if (configuration.emulateTerminal() && !debug) PtyCommandLine().withConsoleMode(true).withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE) else GeneralCommandLine()
cli.exePath = zigExePath.pathString
workingDir.path?.let { cli.withWorkingDirectory(it) }
cli.charset = Charsets.UTF_8

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigConfigTypeBuild.kt
View file

@ -33,7 +33,7 @@ class ZigConfigTypeBuild : ConfigurationTypeBase(
IDENTIFIER,
ZigBrainsBundle.message("configuration.build.name"),
ZigBrainsBundle.message("configuration.build.description"),
Icons.ZIG
Icons.Zig
) {
init {
addFactory(ConfigFactoryRun(this))

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigConfigTypeRun.kt
View file

@ -33,7 +33,7 @@ class ZigConfigTypeRun : ConfigurationTypeBase(
IDENTIFIER,
ZigBrainsBundle.message("configuration.run.name"),
ZigBrainsBundle.message("configuration.run.description"),
Icons.ZIG
Icons.Zig
) {
init {
addFactory(ConfigFactoryRun(this))

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigConfigTypeTest.kt
View file

@ -33,7 +33,7 @@ class ZigConfigTypeTest : ConfigurationTypeBase(
IDENTIFIER,
ZigBrainsBundle.message("configuration.test.name"),
ZigBrainsBundle.message("configuration.test.description"),
Icons.ZIG
Icons.Zig
) {
init {
addFactory(ConfigFactoryRun(this))

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/module/ZigModuleType.kt
View file

@ -40,6 +40,6 @@ object ZigModuleType: ModuleType<ZigModuleBuilder>("com.falsepattern.zigbrains.z
}
override fun getNodeIcon(isOpened: Boolean): Icon {
return Icons.ZIG
return Icons.Zig
}
}

3
core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigDirectoryProjectGenerator.kt
View file

@ -23,7 +23,6 @@
package com.falsepattern.zigbrains.project.newproject
import com.falsepattern.zigbrains.Icons
import com.falsepattern.zigbrains.shared.coroutine.runModalOrBlocking
import com.falsepattern.zigbrains.shared.zigCoroutineScope
import com.intellij.facet.ui.ValidationResult
import com.intellij.ide.util.projectWizard.AbstractNewProjectStep
@ -44,7 +43,7 @@ class ZigDirectoryProjectGenerator: DirectoryProjectGenerator<ZigProjectConfigur
}
override fun getLogo(): Icon {
return Icons.ZIG
return Icons.Zig
}
override fun createPeer(): ProjectGeneratorPeer<ZigProjectConfigurationData> {

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectWizard.kt
View file

@ -37,7 +37,7 @@ class ZigNewProjectWizard: LanguageGeneratorNewProjectWizard {
override val name: String
get() = "Zig"
override val icon: Icon
get() = Icons.ZIG
get() = Icons.Zig
override val ordinal: Int
get() = 900

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
View file

@ -65,7 +65,7 @@ import javax.swing.tree.TreePath
class BuildToolWindowContext(private val project: Project): Disposable {
val rootNode: DefaultMutableTreeNode = DefaultMutableTreeNode(BaseNodeDescriptor<Any>(project, project.name, AllIcons.Actions.ProjectDirectory))
private val buildZig: DefaultMutableTreeNode = DefaultMutableTreeNode(BaseNodeDescriptor<Any>(project, ZigBrainsBundle.message("build.tool.window.tree.steps.label"), Icons.ZIG))
private val buildZig: DefaultMutableTreeNode = DefaultMutableTreeNode(BaseNodeDescriptor<Any>(project, ZigBrainsBundle.message("build.tool.window.tree.steps.label"), Icons.Zig))
init {
rootNode.add(buildZig)
}

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/template/ZigProjectTemplate.kt
View file

@ -29,7 +29,7 @@ import javax.swing.Icon
sealed class ZigProjectTemplate(
@ListItem val name: String,
val isBinary: Boolean,
val icon: Icon = Icons.ZIG
val icon: Icon = Icons.Zig
) {
abstract fun fileTemplates(): Map<String, String>
}

2
core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/stdlib/ZigSyntheticLibrary.kt
View file

@ -60,7 +60,7 @@ class ZigSyntheticLibrary(val project: Project) : SyntheticLibrary(), ItemPresen
}
override fun getIcon(unused: Boolean): Icon {
return Icons.ZIG
return Icons.Zig
}
override fun getSourceRoots(): Collection<VirtualFile> {

2
core/src/main/kotlin/com/falsepattern/zigbrains/zig/ZigFileType.kt
View file

@ -33,5 +33,5 @@ object ZigFileType : LanguageFileType(ZigLanguage) {
override fun getDefaultExtension() = "zig"
override fun getIcon() = Icons.ZIG
override fun getIcon() = Icons.Zig
}

2
core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt
View file

@ -38,7 +38,7 @@ class ZigColorSettingsPage: ColorSettingsPage {
override fun getDisplayName() = ZigBrainsBundle.message("configurable.name.zig-color-settings-page")
override fun getIcon() = Icons.ZIG
override fun getIcon() = Icons.Zig
override fun getHighlighter() = ZigSyntaxHighlighter()

2
core/src/main/kotlin/com/falsepattern/zigbrains/zon/ZonFileType.kt
View file

@ -33,5 +33,5 @@ object ZonFileType: LanguageFileType(ZonLanguage) {
override fun getDefaultExtension() = "zon"
override fun getIcon() = Icons.ZON
override fun getIcon() = Icons.Zon
}

2
core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonColorSettingsPage.kt
View file

@ -35,7 +35,7 @@ class ZonColorSettingsPage: ColorSettingsPage {
override fun getDisplayName() = ZigBrainsBundle.message("configurable.name.zon-color-settings-page")
override fun getIcon() = Icons.ZON
override fun getIcon() = Icons.Zon
override fun getHighlighter() = ZonSyntaxHighlighter()

8
core/src/main/resources/META-INF/zigbrains-core.xml
View file

@ -178,20 +178,18 @@
/>
</extensions>
<actions>
<actions resource-bundle="zigbrains.ActionsBundle">
<action
id="zigbrains.discover.steps"
class="com.falsepattern.zigbrains.project.steps.discovery.ZigDiscoverStepsAction"
text="Reload Zig Build Steps"
description="Scan the project and detect build.zig steps using the current toolchain"
icon="AllIcons.Actions.Refresh"
/>
<action
id="zigbrains.file.new"
class="com.falsepattern.zigbrains.project.actions.ZigNewFileAction"
text="New Zig File"
icon="com.falsepattern.zigbrains.Icons.Zig"
>
<add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
<add-to-group group-id="NewGroup" anchor="after" relative-to-action="FileTemplateSeparatorGroup"/>
</action>
</actions>
<!-- endregion Project -->

3
core/src/main/resources/zigbrains/ActionsBundle.properties Normal file
View file

@ -0,0 +1,3 @@
action.zigbrains.discover.steps.text=Reload Zig Build Steps
action.zigbrains.discover.steps.description=Scan the project and detect build.zig steps using the current toolchain
action.zigbrains.file.new.text=Zig File

2
gradle.properties
View file

@ -1,7 +1,7 @@
pluginName=ZigBrains
pluginRepositoryUrl=https://github.com/FalsePattern/ZigBrains
pluginVersion=20.0.3
pluginVersion=20.0.4
pluginSinceBuild=242
pluginUntilBuild=242.*