fix(conf): fix conf path

iguissouma · Jun 28, 2022 · cce5aa6 · cce5aa6
1 parent ac3ba34
commit cce5aa6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ kotlin.code.style=official
 
 pluginGroup = com.chutneytesting.idea
 pluginName = chutney-idea-plugin
-pluginVersion = 1.13
+pluginVersion = 1.14-SNAPSHOT
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/src/main/kotlin/com/chutneytesting/idea/actions/OpenChutneyConfigFileAction.kt b/src/main/kotlin/com/chutneytesting/idea/actions/OpenChutneyConfigFileAction.kt
@@ -19,7 +19,7 @@ class OpenChutneyConfigFileAction : AnAction() {
     override fun actionPerformed(event: AnActionEvent) {
         val project: Project = event.project ?: return
         val chutneyDirectoryConf = PathUtil.toSystemIndependentName(PathManager.getConfigPath() + "/chutney-idea-plugin/conf/")
-        val confFile = chutneyDirectoryConf + "GLOBAL.json"
+        val confFile = chutneyDirectoryConf + "environment/" +"GLOBAL.json"
         val findFileByPath = LocalFileSystem.getInstance().findFileByPath(confFile)
         if (findFileByPath == null) {
             EventDataLogger.logWarning("Chutney ConfigFile <b>GLOBAL.json</b> can't be opened.<br>" +

diff --git a/src/main/kotlin/com/chutneytesting/idea/completion/TargetsValueCompletionHelper.kt b/src/main/kotlin/com/chutneytesting/idea/completion/TargetsValueCompletionHelper.kt
@@ -13,7 +13,7 @@ object TargetsValueCompletionHelper {
         get() {
             try {
                 val chutneyDirectoryConf = PathUtil.toSystemIndependentName(PathManager.getConfigPath() + "/chutney-idea-plugin/conf/")
-                val confFile = chutneyDirectoryConf + "GLOBAL.json"
+                val confFile = chutneyDirectoryConf + "environment/" + "GLOBAL.json"
                 val fileReader = FileReader(File(confFile))
                 val result = Gson().fromJson(fileReader, Result::class.java)
                 return if (result?.targets == null) emptyList() else result.targets!!

diff --git a/src/main/kotlin/com/chutneytesting/idea/server/ChutneyServer.kt b/src/main/kotlin/com/chutneytesting/idea/server/ChutneyServer.kt
@@ -141,7 +141,7 @@ class ChutneyServer(settings: ChutneyServerSettings) {
             //commandLine.addParameter("-cp")
             //commandLine.addParameter(classpath)
             commandLine.addParameter("--server.port=" + settings.port)
-            commandLine.addParameter("--chutney.configuration-folder=" + PathUtil.toSystemIndependentName(PathManager.getConfigPath() + "/chutney-idea-plugin/conf/"))
+            commandLine.addParameter("--chutney.configuration-folder=" + PathUtil.toSystemIndependentName(PathManager.getConfigPath() + "/chutney-idea-plugin/conf"))
             commandLine.addParameter("-Dloader.path=" + PathUtil.toSystemIndependentName(PathManager.getConfigPath() + "/chutney-idea-plugin/dependencies/"))
             //commandLine.addParameter(String.valueOf(settings.getPort()));
             //commandLine.addParameter("--runnerMode");