浏览代码

delete the code that never use

littleheuer 4 年之前
父节点
当前提交
03fbab6849

+ 5 - 6
build.gradle

@@ -6,8 +6,8 @@ plugins {
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'idea'
 
-group 'org.example'
-version '1.0-SNAPSHOT'
+group 'org.tboox.xmake'
+version '1.0.6'
 
 repositories {
     mavenCentral()
@@ -24,10 +24,9 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-        //clion 配置
-        type 'CL'
-        version = 'CL-2021.1.2'
-        downloadSources false
+    type 'CL'
+    version = 'CL-2021.1.2'
+    downloadSources false
     plugins = ["com.intellij.cidr.base", "com.intellij.clion"]
 }
 

+ 0 - 1
src/main/kotlin/org/tboox/xmake/icons/XMakeIconProvider.kt

@@ -1,7 +1,6 @@
 package org.tboox.xmake.icons
 
 import com.intellij.ide.IconProvider
-import com.intellij.openapi.diagnostic.Logger
 import com.intellij.psi.PsiElement
 import javax.swing.Icon
 

+ 2 - 4
src/main/kotlin/org/tboox/xmake/project/XMakeDirectoryProjectGenerator.kt

@@ -5,8 +5,6 @@ import com.intellij.ide.util.projectWizard.AbstractNewProjectStep
 import com.intellij.ide.util.projectWizard.CustomStepProjectGenerator
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.wm.impl.welcomeScreen.AbstractActionWithPanel
 import com.intellij.platform.DirectoryProjectGenerator
@@ -28,14 +26,14 @@ class XMakeDirectoryProjectGenerator : DirectoryProjectGeneratorBase<XMakeConfig
     override fun createPeer(): ProjectGeneratorPeer<XMakeConfigData> = XMakeProjectGeneratorPeer().also { peer = it }
 
     override fun validate(baseDirPath: String): ValidationResult {
-        val crateName = File(baseDirPath).nameWithoutExtension
+        File(baseDirPath).nameWithoutExtension
         return ValidationResult.OK
     }
 
     override fun generateProject(project: Project, baseDir: VirtualFile, data: XMakeConfigData, module: Module) {
         // get content entry path
         val contentEntryPath = baseDir.canonicalPath ?: return
-        val t =listOf(
+        listOf(
             SystemUtils.xmakeProgram,
             "create",
             "-P",

+ 0 - 1
src/main/kotlin/org/tboox/xmake/project/XMakeModuleBuilder.kt

@@ -12,7 +12,6 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.LocalFileSystem
 import org.tboox.xmake.utils.SystemUtils
 
-import javax.swing.DefaultComboBoxModel
 
 class XMakeModuleBuilder : ModuleBuilder() {
     var configurationData: XMakeConfigData? = null

+ 2 - 2
src/main/kotlin/org/tboox/xmake/project/XMakeNewProjectPanel.kt

@@ -41,7 +41,7 @@ class XMakeNewProjectPanel : Disposable {
 
     val data: XMakeConfigData
         get() = XMakeConfigData(
-            languagesModel.selectedItem.toString().toLowerCase(),
+            languagesModel.selectedItem.toString().lowercase(),
             template
         )
 
@@ -59,7 +59,7 @@ class XMakeNewProjectPanel : Disposable {
         row("XMake SDK:") {
             val project = ProjectManager.getInstance().defaultProject
             val sdkModel = ProjectSdksModel()
-            sdkModel.addSdk(XMakeSdkType.instance, XMakeSdkType.instance.suggestHomePath()!!, null);
+            sdkModel.addSdk(XMakeSdkType.instance, XMakeSdkType.instance.suggestHomePath()!!, null)
             val myJdkComboBox = SdkComboBox(SdkComboBoxModel.createSdkComboBoxModel(project, sdkModel))
             wrapComponent(myJdkComboBox)(growX, pushX)
         }

+ 1 - 9
src/main/kotlin/org/tboox/xmake/project/XMakeProjectConfigurable.kt

@@ -1,7 +1,6 @@
 package org.tboox.xmake.project
 
 import com.intellij.execution.ExecutionBundle
-import com.intellij.execution.configuration.EnvironmentVariablesComponent
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.options.Configurable
@@ -13,21 +12,14 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.ui.RawCommandLineEditor
 import com.intellij.ui.components.CheckBox
 import com.intellij.ui.components.Label
-import com.intellij.ui.components.JBLabel
-import com.intellij.ui.layout.CCFlags
 import com.intellij.ui.layout.LayoutBuilder
 import com.intellij.ui.layout.Row
 import com.intellij.ui.layout.panel
 import org.tboox.xmake.shared.XMakeConfiguration
 import org.tboox.xmake.shared.xmakeConfiguration
 import java.awt.Dimension
-import java.nio.file.Path
-import java.nio.file.Paths
 import javax.swing.JComponent
-import javax.swing.JList
 import javax.swing.JPanel
-import javax.swing.JLabel
-import javax.swing.JTextField
 import javax.swing.JTextArea
 import javax.swing.DefaultComboBoxModel
 import javax.swing.event.ListDataEvent
@@ -38,7 +30,7 @@ import java.awt.event.ItemEvent
 import java.awt.event.ItemListener
 
 class XMakeProjectConfigurable(
-        private val project: Project
+        project: Project
 ) : Configurable, Configurable.NoScroll {
 
     // the xmake configuration

+ 0 - 2
src/main/kotlin/org/tboox/xmake/project/XMakeProjectGeneratorPeer.kt

@@ -1,8 +1,6 @@
 package org.tboox.xmake.project
 
-import com.intellij.openapi.options.ConfigurationException
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
-import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.platform.GeneratorPeerImpl
 import com.intellij.ui.layout.panel
 import javax.swing.JComponent

+ 0 - 11
src/main/kotlin/org/tboox/xmake/project/XMakeSdkSettingsStep.kt

@@ -2,19 +2,9 @@ import com.intellij.ide.util.projectWizard.ModuleBuilder
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.openapi.module.Module
-import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.roots.ModifiableRootModel
-import com.intellij.openapi.roots.ui.configuration.SdkComboBox
-import com.intellij.openapi.roots.ui.configuration.SdkComboBoxModel
-import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel
 import com.intellij.ui.layout.panel
-import org.jetbrains.annotations.Nullable
-import org.tboox.xmake.project.XMakeSdkType
-import java.awt.BorderLayout
 import javax.swing.JComponent
-import javax.swing.JLabel
-import javax.swing.JPanel
-import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.util.Disposer
 import org.tboox.xmake.project.XMakeModuleBuilder
 import org.tboox.xmake.project.XMakeNewProjectPanel
@@ -48,7 +38,6 @@ class XMakeSdkSettingsStep(
     private object ConfigurationUpdater : ModuleBuilder.ModuleConfigurationUpdater() {
 
         override fun update(module: Module, rootModel: ModifiableRootModel) {
-            //TODO:数据联动
         }
     }
 }

+ 2 - 4
src/main/kotlin/org/tboox/xmake/project/XMakeSdkType.kt

@@ -1,6 +1,5 @@
 package org.tboox.xmake.project
 
-import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.projectRoots.SdkType
 import com.intellij.openapi.projectRoots.SdkAdditionalData
@@ -11,7 +10,6 @@ import com.intellij.openapi.projectRoots.Sdk
 import org.tboox.xmake.icons.XMakeIcons
 import org.jdom.Element
 import org.tboox.xmake.utils.SystemUtils
-import java.io.File
 import javax.swing.Icon
 
 class XMakeSdkType : SdkType("XMake SDK") {
@@ -32,7 +30,7 @@ class XMakeSdkType : SdkType("XMake SDK") {
         return "XMake"
     }
 
-    override fun getVersionString(sdk: Sdk): String? {
+    override fun getVersionString(sdk: Sdk): String {
         return SystemUtils.xmakeVersion
     }
 
@@ -62,6 +60,6 @@ class XMakeSdkType : SdkType("XMake SDK") {
 
         // the instance
         val instance: XMakeSdkType
-            get() = SdkType.findInstance(XMakeSdkType::class.java)
+            get() = findInstance(XMakeSdkType::class.java)
     }
 }

+ 3 - 9
src/main/kotlin/org/tboox/xmake/project/XMakeToolWindowOutputPanel.kt

@@ -2,22 +2,16 @@ package org.tboox.xmake.project
 
 import com.intellij.execution.filters.TextConsoleBuilderFactory
 import com.intellij.execution.ui.ConsoleView
-import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionToolbar
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.SimpleToolWindowPanel
-import javax.swing.JEditorPane
-import javax.swing.JList
-import javax.swing.JPanel
-import javax.swing.ListSelectionModel
 
-class XMakeToolWindowOutputPanel(project: Project) : SimpleToolWindowPanel(false) {
-
-    // the project
-    val project = project
+class XMakeToolWindowOutputPanel(// the project
+    val project: Project
+) : SimpleToolWindowPanel(false) {
 
     // the toolbar
     val toolbar: ActionToolbar = run {

+ 0 - 3
src/main/kotlin/org/tboox/xmake/project/XMakeToolWindowProblemPanel.kt

@@ -18,17 +18,14 @@ import org.tboox.xmake.shared.XMakeProblem
 import java.awt.Font
 import java.awt.event.MouseEvent
 import java.awt.event.MouseAdapter
-import javax.swing.JEditorPane
 import javax.swing.JScrollPane
 import javax.swing.JList
-import javax.swing.JPanel
 import java.io.File
 import javax.swing.ListSelectionModel
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.vfs.LocalFileSystem
 import org.tboox.xmake.shared.xmakeConfiguration
 import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.TextAttributes
 

+ 0 - 73
src/main/kotlin/org/tboox/xmake/run/XMakeProjectTasksRunner.kt

@@ -1,73 +0,0 @@
-package org.tboox.xmake.run
-
-import com.intellij.execution.*
-import com.intellij.execution.process.ProcessAdapter
-import com.intellij.execution.process.ProcessEvent
-import com.intellij.execution.runners.ExecutionEnvironment
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.project.Project
-import com.intellij.task.*
-import com.intellij.task.ExecuteRunConfigurationTask
-import org.jetbrains.concurrency.AsyncPromise
-import org.jetbrains.concurrency.Promise
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
-
-class XMakeProjectTasksRunner : ProjectTaskRunner() {
-
-    override fun run(
-        project: Project,
-        context: ProjectTaskContext,
-        callback: ProjectTaskNotification?,
-        tasks: MutableCollection<out ProjectTask>
-    ) {
-        // clear console first
-        project.xmakeConsoleView.clear()
-
-        // configure and build it
-        val xmakeConfiguration = project.xmakeConfiguration
-        if (xmakeConfiguration.changed) {
-            SystemUtils.runvInConsole(project, xmakeConfiguration.configurationCommandLine)
-                .addProcessListener(object : ProcessAdapter() {
-                    override fun processTerminated(e: ProcessEvent) {
-                        SystemUtils.runvInConsole(project, xmakeConfiguration.buildCommandLine, false, true, true)
-                    }
-                })
-            xmakeConfiguration.changed = false
-        } else {
-            SystemUtils.runvInConsole(project, xmakeConfiguration.buildCommandLine, true, true, true)
-        }
-    }
-
-    override fun canRun(projectTask: ProjectTask): Boolean {
-
-        // hook 'Build Project/Module F9' => build
-        if (projectTask is ModuleBuildTask) {
-            return true
-        }
-
-
-        // run configuration?
-        if (projectTask is ExecuteRunConfigurationTask) {
-            val runProfile = projectTask.runProfile
-            if (runProfile is XMakeRunConfiguration) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    override fun createExecutionEnvironment(
-        project: Project,
-        task: ExecuteRunConfigurationTask,
-        executor: Executor?
-    ): ExecutionEnvironment? = null
-
-    companion object {
-
-        // get log
-        private val Log = Logger.getInstance(XMakeProjectTasksRunner::class.java.getName())
-    }
-}

+ 0 - 10
src/main/kotlin/org/tboox/xmake/run/XMakeRunConfigurationEditor.kt

@@ -1,27 +1,17 @@
 package org.tboox.xmake.run
 
-import com.intellij.execution.ExecutionBundle
 import com.intellij.execution.configuration.EnvironmentVariablesComponent
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.options.SettingsEditor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
-import com.intellij.openapi.ui.LabeledComponent
-import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.ui.RawCommandLineEditor
-import com.intellij.ui.components.CheckBox
 import com.intellij.ui.layout.*
 import com.intellij.ui.components.Label
-import org.tboox.xmake.shared.XMakeConfiguration
 import org.tboox.xmake.shared.xmakeConfiguration
 import java.awt.Dimension
-import java.nio.file.Path
-import java.nio.file.Paths
 import javax.swing.JComponent
-import javax.swing.JList
 import javax.swing.JPanel
-import javax.swing.JTextField
 import javax.swing.DefaultComboBoxModel
 
 class XMakeRunConfigurationEditor(private val project: Project) : SettingsEditor<XMakeRunConfiguration>() {

+ 1 - 1
src/main/kotlin/org/tboox/xmake/run/XMakeRunner.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.run;
+package org.tboox.xmake.run
 
 import com.intellij.execution.configurations.RunProfile
 import com.intellij.execution.executors.DefaultRunExecutor

+ 3 - 4
src/main/kotlin/org/tboox/xmake/shared/XMakeConfiguration.kt

@@ -10,10 +10,9 @@ import com.intellij.openapi.project.Project
 import org.tboox.xmake.utils.SystemUtils
 
 @State(name = "XMakeProjectSettings")
-class XMakeConfiguration(project: Project) : PersistentStateComponent<XMakeConfiguration.State>, ProjectComponent {
-
-    // the project
-    val project = project
+class XMakeConfiguration(// the project
+    val project: Project
+) : PersistentStateComponent<XMakeConfiguration.State>, ProjectComponent {
 
     // the platforms
     val platforms = arrayOf("macosx", "linux", "windows", "android", "iphoneos", "watchos", "mingw")

+ 0 - 1
src/main/kotlin/org/tboox/xmake/utils/SystemUtils.kt

@@ -19,7 +19,6 @@ import java.io.InputStreamReader
 import java.io.File
 import java.util.regex.Pattern
 
-import java.nio.charset.Charset
 
 object SystemUtils {