From cce5aa6f3f0fc09a05ef6eab7fc902dc68152c48 Mon Sep 17 00:00:00 2001 From: karim Goubbaa Date: Tue, 28 Jun 2022 16:08:51 +0200 Subject: [PATCH] fix(conf): fix conf path --- gradle.properties | 2 +- .../chutneytesting/idea/actions/OpenChutneyConfigFileAction.kt | 2 +- .../idea/completion/TargetsValueCompletionHelper.kt | 2 +- src/main/kotlin/com/chutneytesting/idea/server/ChutneyServer.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 20177c3..0a507c0 100755 --- 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 index 27b3d24..7c0d8a8 100755 --- 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 GLOBAL.json can't be opened.
" + diff --git a/src/main/kotlin/com/chutneytesting/idea/completion/TargetsValueCompletionHelper.kt b/src/main/kotlin/com/chutneytesting/idea/completion/TargetsValueCompletionHelper.kt index 5776c61..c66c695 100755 --- 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 index 84cd0da..773bb49 100755 --- 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");