From 13996193acbc1919763c4813ca70756105860517 Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Thu, 30 Jan 2025 13:25:32 +0100 Subject: [PATCH] backport: 20.3.0 --- CHANGELOG.md | 5 +++ .../zigbrains/debugger/dap/DAPDriver.kt | 4 +- .../toolchain/ZigDebuggerToolchainService.kt | 12 +++--- .../debugger/win/MSVCDriverConfiguration.kt | 2 +- .../zigbrains/lsp/config/ZLSConfig.kt | 2 - .../project/execution/base/ZigProfileState.kt | 4 +- .../project/toolchain/tools/ZigTool.kt | 2 +- .../zig/highlighter/ZigColorSettingsPage.kt | 1 - .../zig/highlighter/ZigSyntaxHighlighter.kt | 41 +++++++++---------- .../zigbrains/zig/util/ZigStringUtil.kt | 2 - .../resources/META-INF/zigbrains-core.xml | 7 ++++ .../colors/ZigColorsConfiguration.xml | 23 +++++++++++ gradle.properties | 2 +- 13 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 core/src/main/resources/colors/ZigColorsConfiguration.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 80d0184f..2562a50c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,11 @@ Changelog structure reference: ## [Unreleased] +## [20.3.0] + +- Zig + - Improved default colors + ## [20.2.2] ### Fixed diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt index 5af139b6..adc3a66f 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt @@ -213,7 +213,7 @@ abstract class DAPDriver() args["program"] = Util.toWinPath(cli.exePath) - args["cmd"] = cli.workDirectory.toString() + args["cmd"] = cli.workingDirectory.toString() args["name"] = "CPP Debug" args["type"] = "cppvsdbg" args["request"] = "launch" @@ -953,7 +953,7 @@ abstract class DAPDriver. */ -@file:Suppress("HardCodedStringLiteral") - package com.falsepattern.zigbrains.lsp.config import kotlinx.serialization.SerialName diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt index 60ed7630..20fe0cf7 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt @@ -65,9 +65,9 @@ abstract class ZigProfileState> ( // 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().withConsoleMode(true).withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE) else GeneralCommandLine() - cli.exePath = zigExePath.pathString + cli.withExePath(zigExePath.pathString) workingDir.path?.let { cli.withWorkingDirectory(it) } - cli.charset = Charsets.UTF_8 + cli.withCharset(Charsets.UTF_8) cli.addParameters(configuration.buildCommandLineArgs(debug)) return configuration.patchCommandLine(cli) } diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigTool.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigTool.kt index 133dbcb6..14fee7c1 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigTool.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigTool.kt @@ -62,7 +62,7 @@ abstract class ZigTool(val toolchain: AbstractZigToolchain) { ): GeneralCommandLine { val cli = GeneralCommandLine() .withExePath(toolchain.pathToExecutable(toolName).toString()) - .withWorkDirectory(workingDirectory?.toString()) + .withWorkingDirectory(workingDirectory) .withParameters(*parameters) .withCharset(Charsets.UTF_8) return toolchain.patchCommandLine(cli) diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt index 416ea81c..d5274c1b 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt @@ -93,7 +93,6 @@ class ZigColorSettingsPage: ColorSettingsPage { ADD_HIGHLIGHT } -@Suppress("HardCodedStringLiteral") private val ADD_HIGHLIGHT = HashMap().apply { this["enum"] = ZigSyntaxHighlighter.ENUM_REF this["enum_decl"] = ZigSyntaxHighlighter.ENUM_DECL diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt index d1650912..336aca4c 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt @@ -45,15 +45,24 @@ class ZigSyntaxHighlighter: SyntaxHighlighterBase() { // @formatter:off val BAD_CHAR = createKey("BAD_CHARACTER" , HighlighterColors.BAD_CHARACTER ) val BUILTIN = createKey("BUILTIN" , DefaultLanguageHighlighterColors.STATIC_METHOD ) - val CHAR = createKey("CHAR" , DefaultLanguageHighlighterColors.NUMBER ) + val NUMBER = createKey("NUMBER" , DefaultLanguageHighlighterColors.NUMBER ) + val CHAR = createKey("CHAR" , NUMBER ) + val TYPE_DECL = createKey("TYPE_DECL" , DefaultLanguageHighlighterColors.CLASS_NAME ) + val TYPE_DECL_GEN = createKey("TYPE_DECL_GEN" , TYPE_DECL ) + val TYPE_REF = createKey("TYPE" , DefaultLanguageHighlighterColors.CLASS_REFERENCE ) + val TYPE_REF_GEN = createKey("TYPE_GEN" , TYPE_REF ) + val TYPE_PARAM_DECL = createKey("TYPE_PARAM_DECL" , TYPE_REF ) + val TYPE_PARAM = createKey("TYPE_PARAM" , TYPE_PARAM_DECL ) + val STRUCT_DECL = createKey("STRUCT_DECL" , TYPE_DECL ) + val STRUCT_REF = createKey("STRUCT" , TYPE_REF ) val COMMENT = createKey("COMMENT" , DefaultLanguageHighlighterColors.LINE_COMMENT ) val COMMENT_DOC = createKey("COMMENT_DOC" , DefaultLanguageHighlighterColors.DOC_COMMENT ) - val ENUM_DECL = createKey("ENUM_DECL" , DefaultLanguageHighlighterColors.CLASS_NAME ) - val ENUM_REF = createKey("ENUM" , DefaultLanguageHighlighterColors.CLASS_REFERENCE ) - val ENUM_MEMBER_DECL = createKey("ENUM_MEMBER_DECL" , DefaultLanguageHighlighterColors.STATIC_FIELD ) + val ENUM_DECL = createKey("ENUM_DECL" , STRUCT_DECL ) + val ENUM_REF = createKey("ENUM" , STRUCT_REF ) + val ENUM_MEMBER_DECL = createKey("ENUM_MEMBER_DECL" , DefaultLanguageHighlighterColors.CONSTANT ) val ENUM_MEMBER_REF = createKey("ENUM_MEMBER" , ENUM_MEMBER_DECL ) - val ERROR_TAG_DECL = createKey("ERROR_TAG_DECL" , DefaultLanguageHighlighterColors.STATIC_FIELD ) - val ERROR_TAG_REF = createKey("ERROR_TAG" , ERROR_TAG_DECL ) + val ERROR_TAG_DECL = createKey("ERROR_TAG_DECL" , ENUM_MEMBER_DECL ) + val ERROR_TAG_REF = createKey("ERROR_TAG" , ENUM_MEMBER_REF ) val PROPERTY_DECL = createKey("PROPERTY_DECL" , DefaultLanguageHighlighterColors.INSTANCE_FIELD ) val PROPERTY_REF = createKey("PROPERTY" , PROPERTY_DECL ) val FUNCTION_DECL = createKey("FUNCTION_DECL" , DefaultLanguageHighlighterColors.FUNCTION_DECLARATION ) @@ -67,27 +76,18 @@ class ZigSyntaxHighlighter: SyntaxHighlighterBase() { val METHOD_DECL_GEN = createKey("METHOD_DECL_GEN" , METHOD_DECL ) val METHOD_REF = createKey("METHOD" , FUNCTION_REF ) val METHOD_REF_GEN = createKey("METHOD_GEN" , METHOD_REF ) - val NAMESPACE_DECL = createKey("NAMESPACE_DECL" , DefaultLanguageHighlighterColors.CLASS_NAME ) - val NAMESPACE_REF = createKey("NAMESPACE" , DefaultLanguageHighlighterColors.CLASS_REFERENCE ) - val NUMBER = createKey("NUMBER" , DefaultLanguageHighlighterColors.NUMBER ) val OPERATOR = createKey("OPERATOR" , DefaultLanguageHighlighterColors.OPERATION_SIGN ) val PARAMETER = createKey("PARAMETER" , DefaultLanguageHighlighterColors.PARAMETER ) val STRING = createKey("STRING" , DefaultLanguageHighlighterColors.STRING ) val STRING_ESC_V = createKey("STRING_ESC_V" , DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE ) val STRING_ESC_I_C = createKey("STRING_ESC_I_C" , DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE ) val STRING_ESC_I_U = createKey("STRING_ESC_I_U" , DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE ) - val STRUCT_DECL = createKey("STRUCT_DECL" , DefaultLanguageHighlighterColors.CLASS_NAME ) - val STRUCT_REF = createKey("STRUCT" , DefaultLanguageHighlighterColors.CLASS_REFERENCE ) - val TYPE_DECL = createKey("TYPE_DECL" , DefaultLanguageHighlighterColors.CLASS_NAME ) - val TYPE_DECL_GEN = createKey("TYPE_DECL_GEN" , TYPE_DECL ) - val TYPE_REF = createKey("TYPE" , DefaultLanguageHighlighterColors.CLASS_REFERENCE ) - val TYPE_REF_GEN = createKey("TYPE_GEN" , TYPE_REF ) - val TYPE_PARAM = createKey("TYPE_PARAM" , DefaultLanguageHighlighterColors.PARAMETER ) - val TYPE_PARAM_DECL = createKey("TYPE_PARAM_DECL" , TYPE_PARAM ) - val VARIABLE_DECL = createKey("VARIABLE_DECL" , DefaultLanguageHighlighterColors.LOCAL_VARIABLE ) - val VARIABLE_DECL_DEPR= createKey("VARIABLE_DECL_DEPR" , VARIABLE_DECL ) - val VARIABLE_REF = createKey("VARIABLE" , VARIABLE_DECL ) + val NAMESPACE_DECL = createKey("NAMESPACE_DECL" , STRUCT_DECL ) + val NAMESPACE_REF = createKey("NAMESPACE" , STRUCT_REF ) + val VARIABLE_REF = createKey("VARIABLE" , DefaultLanguageHighlighterColors.LOCAL_VARIABLE ) val VARIABLE_REF_DEPR = createKey("VARIABLE_REF_DEPL" , VARIABLE_REF ) + val VARIABLE_DECL = createKey("VARIABLE_DECL" , VARIABLE_REF ) + val VARIABLE_DECL_DEPR= createKey("VARIABLE_DECL_DEPR" , VARIABLE_DECL ) // @formatter:on private val EMPTY_KEYS = arrayOf() @@ -102,7 +102,6 @@ class ZigSyntaxHighlighter: SyntaxHighlighterBase() { *ZigTypes::class.java .fields .filter { - @Suppress("HardCodedStringLiteral") it.name.startsWith("KEYWORD_") } .map { it.get(null) as IElementType } diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/util/ZigStringUtil.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/util/ZigStringUtil.kt index 9979d5a5..aa47fd46 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/util/ZigStringUtil.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/util/ZigStringUtil.kt @@ -20,8 +20,6 @@ * along with ZigBrains. If not, see . */ -@file:Suppress("HardCodedStringLiteral") - package com.falsepattern.zigbrains.zig.util import com.intellij.openapi.util.TextRange diff --git a/core/src/main/resources/META-INF/zigbrains-core.xml b/core/src/main/resources/META-INF/zigbrains-core.xml index e790d200..3a333a95 100644 --- a/core/src/main/resources/META-INF/zigbrains-core.xml +++ b/core/src/main/resources/META-INF/zigbrains-core.xml @@ -54,6 +54,11 @@ + + + @@ -164,6 +169,7 @@ implementation="com.falsepattern.zigbrains.project.toolchain.stdlib.ZigLibraryRootProvider" /> + + diff --git a/core/src/main/resources/colors/ZigColorsConfiguration.xml b/core/src/main/resources/colors/ZigColorsConfiguration.xml new file mode 100644 index 00000000..4716a95d --- /dev/null +++ b/core/src/main/resources/colors/ZigColorsConfiguration.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 830a3414..56613f19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ pluginName=ZigBrains pluginRepositoryUrl=https://github.com/FalsePattern/ZigBrains -pluginVersion=20.2.2 +pluginVersion=20.3.0 pluginSinceBuild=242 pluginUntilBuild=242.*