diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectConfigurationData.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectConfigurationData.kt index 5fa4133a..ab425caf 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectConfigurationData.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectConfigurationData.kt @@ -119,10 +119,10 @@ data class ZigProjectConfigurationData( if (git) { project.zigCoroutineScope.launch { GitRepositoryInitializer.getInstance()?.initRepository(project, baseDir) - createGitIgnoreFile(project, baseDir, requestor) + createGitIgnoreFile(baseDir, requestor) } } else if (forceGitignore) { - createGitIgnoreFile(project, baseDir, requestor) + createGitIgnoreFile(baseDir, requestor) } return@reportProgress true @@ -131,7 +131,7 @@ data class ZigProjectConfigurationData( } -private suspend fun createGitIgnoreFile(project: Project, projectDir: VirtualFile, requestor: Any) { +private suspend fun createGitIgnoreFile(projectDir: VirtualFile, requestor: Any) { if (projectDir.findChild(".gitignore") != null) { return } diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigRegularRunner.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigRegularRunner.kt index 166dc0e2..771e94d2 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigRegularRunner.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigRegularRunner.kt @@ -35,7 +35,6 @@ import com.intellij.openapi.application.ModalityState class ZigRegularRunner: ZigProgramRunner>(DefaultRunExecutor.EXECUTOR_ID) { override suspend fun execute(state: ZigProfileState<*>, toolchain: AbstractZigToolchain, environment: ExecutionEnvironment): RunContentDescriptor? { - val cli = state.getCommandLine(toolchain, false) val exec = state.execute(environment.executor, this) return withEDTContext(ModalityState.any()) { val runContentBuilder = RunContentBuilder(exec, environment) diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/discovery/ZigStepDiscoveryService.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/discovery/ZigStepDiscoveryService.kt index 86900d6f..e80c17dc 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/discovery/ZigStepDiscoveryService.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/discovery/ZigStepDiscoveryService.kt @@ -90,7 +90,7 @@ class ZigStepDiscoveryService(private val project: Project) { null } if (result == null) { - {} + } else if (result.checkSuccess(LOG)) { currentTimeoutSec = DEFAULT_TIMEOUT_SEC val lines = result.stdoutLines diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt index 6c282fc6..e0813dbd 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt @@ -81,18 +81,18 @@ class BuildToolWindowContext(private val project: Project): Disposable { val tree = Tree(model).also { it.isRootVisible = false } } private val viewPanel = JPanel(VerticalLayout(0)) - private val steps = TreeBox() - private val build = if (IPCUtil.haveIPC) TreeBox() else null + private val stepsBox = TreeBox() + private val buildBox = if (IPCUtil.haveIPC) TreeBox() else null private var live = AtomicBoolean(true) init { viewPanel.add(JBLabel(ZigBrainsBundle.message("build.tool.window.tree.steps.label"))) - viewPanel.add(steps.panel) - steps.panel.setNotScanned() + viewPanel.add(stepsBox.panel) + stepsBox.panel.setNotScanned() - steps.tree.addMouseListener(object : MouseAdapter() { + stepsBox.tree.addMouseListener(object : MouseAdapter() { override fun mouseClicked(e: MouseEvent) { if (e.clickCount == 2) { - val node = steps.tree.lastSelectedPathComponent as? DefaultMutableTreeNode ?: return + val node = stepsBox.tree.lastSelectedPathComponent as? DefaultMutableTreeNode ?: return val step = node.userObject as? StepNodeDescriptor ?: return val stepName = step.element?.name ?: return @@ -112,10 +112,10 @@ class BuildToolWindowContext(private val project: Project): Disposable { } }) - if (build != null) { + if (buildBox != null) { viewPanel.add(JBLabel(ZigBrainsBundle.message("build.tool.window.tree.build.label"))) - viewPanel.add(build.panel) - build.panel.setNoBuilds() + viewPanel.add(buildBox.panel) + buildBox.panel.setNoBuilds() project.zigCoroutineScope.launch { while (!project.isDisposed && live.get()) { @@ -126,14 +126,14 @@ class BuildToolWindowContext(private val project: Project): Disposable { ipc.mutex.withLock { withEDTContext(ModalityState.any()) { if (ipc.nodes.isEmpty()) { - build.root.removeAllChildren() - build.panel.setNoBuilds() + buildBox.root.removeAllChildren() + buildBox.panel.setNoBuilds() return@withEDTContext } val allNodes = ArrayList(ipc.nodes) val existingNodes = ArrayList() val removedNodes = ArrayList() - build.root.children().iterator().forEach { child -> + buildBox.root.children().iterator().forEach { child -> if (child !is ZigIPCService.IPCTreeNode) { return@forEach } @@ -145,18 +145,18 @@ class BuildToolWindowContext(private val project: Project): Disposable { } val newNodes = ArrayList(allNodes) newNodes.removeAll(existingNodes) - removedNodes.forEach { build.root.remove(it) } - newNodes.forEach { build.root.add(it) } + removedNodes.forEach { buildBox.root.remove(it) } + newNodes.forEach { buildBox.root.add(it) } if (removedNodes.isNotEmpty() || newNodes.isNotEmpty()) { - build.model.reload(build.root) + buildBox.model.reload(buildBox.root) } - if (build.root.childCount == 0) { - build.panel.setNoBuilds() + if (buildBox.root.childCount == 0) { + buildBox.panel.setNoBuilds() } else { - build.panel.setViewportBody(build.tree) + buildBox.panel.setViewportBody(buildBox.tree) } for (bn in allNodes) { - expandRecursively(build, bn) + expandRecursively(buildBox, bn) } } } @@ -220,28 +220,28 @@ class BuildToolWindowContext(private val project: Project): Disposable { inner class BuildReloadListener: ZigStepDiscoveryListener { override suspend fun preReload() { - steps.panel.setRunningZigBuild() + stepsBox.panel.setRunningZigBuild() } - override suspend fun postReload(stepInfo: List>) { - steps.root.removeAllChildren() - for ((task, description) in stepInfo) { + override suspend fun postReload(steps: List>) { + stepsBox.root.removeAllChildren() + for ((task, description) in steps) { val icon = when(task) { "install" -> AllIcons.Actions.Install "uninstall" -> AllIcons.Actions.Uninstall else -> AllIcons.RunConfigurations.TestState.Run } - steps.root.add(DefaultMutableTreeNode(StepNodeDescriptor(project, task, icon, description))) + stepsBox.root.add(DefaultMutableTreeNode(StepNodeDescriptor(project, task, icon, description))) } withEDTContext(ModalityState.any()) { - steps.model.reload(steps.root) - steps.panel.setViewportBody(steps.tree) + stepsBox.model.reload(stepsBox.root) + stepsBox.panel.setViewportBody(stepsBox.tree) } } override suspend fun errorReload(type: ZigStepDiscoveryListener.ErrorType, details: String?) { withEDTContext(ModalityState.any()) { - steps.panel.setViewportError(ZigBrainsBundle.message(when(type) { + stepsBox.panel.setViewportError(ZigBrainsBundle.message(when(type) { ZigStepDiscoveryListener.ErrorType.MissingToolchain -> "build.tool.window.status.error.missing-toolchain" ZigStepDiscoveryListener.ErrorType.MissingZigExe -> "build.tool.window.status.error.missing-zig-exe" ZigStepDiscoveryListener.ErrorType.MissingBuildZig -> "build.tool.window.status.error.missing-build-zig" @@ -252,7 +252,7 @@ class BuildToolWindowContext(private val project: Project): Disposable { override suspend fun timeoutReload(seconds: Int) { withEDTContext(ModalityState.any()) { - steps.panel.setViewportError(ZigBrainsBundle.message("build.tool.window.status.timeout", seconds), null) + stepsBox.panel.setViewportError(ZigBrainsBundle.message("build.tool.window.status.timeout", seconds), null) } } } diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/formatter/ZonBlock.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/formatter/ZonBlock.kt index fa17c49f..9569b7e3 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/formatter/ZonBlock.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/formatter/ZonBlock.kt @@ -55,18 +55,16 @@ class ZonBlock( override fun getChildIndent(): Indent { val node = this.node - return getIndentBasedOnParentType(node, null, node.elementType, PLACEHOLDER) + return getIndentBasedOnParentType(node.elementType, PLACEHOLDER) } override fun getIndent(): Indent { val node = this.node val parent = node.treeParent ?: return noneIndent - return getIndentBasedOnParentType(parent, node, parent.elementType, node.elementType) + return getIndentBasedOnParentType(parent.elementType, node.elementType) } } private fun getIndentBasedOnParentType( - parent: ASTNode, - child: ASTNode?, parentType: IElementType, childType: IElementType ): Indent {