From 1c72e08c193fe140c4e46ad1e3dff69b31b8b97f Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Wed, 28 Nov 2018 19:39:23 +0300
Subject: [PATCH 1/2] [groovy] cleanup: make ElementResolveResult#isValidResult
 final

---
 .../plugins/groovy/lang/resolve/ElementResolveResult.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt
index afb6374c5520..dea9d4b78755 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt
@@ -10,7 +10,7 @@ open class ElementResolveResult<out T : PsiElement>(private val element: T) : Gr
 
   final override fun getElement(): T = element
 
-  override fun isValidResult(): Boolean = element.isValid && isStaticsOK && isAccessible && isApplicable
+  final override fun isValidResult(): Boolean = element.isValid && isStaticsOK && isAccessible && isApplicable
 
   override fun isStaticsOK(): Boolean = true
 

From 282efb3cfb615423147b67719352b9d88a83e858 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Tue, 4 Dec 2018 18:01:42 +0300
Subject: [PATCH 2/2] terminal: do not overwrite custom working directory
 specified in "Tools | Terminal"

---
 .../jetbrains/plugins/terminal/LocalTerminalDirectRunner.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 4d8e9eec67bf..60976f6f4290 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -159,10 +159,6 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
     for (LocalTerminalCustomizer customizer : LocalTerminalCustomizer.EP_NAME.getExtensions()) {
       try {
         command = customizer.customizeCommandAndEnvironment(myProject, command, envs);
-
-        if (directory == null) {
-          directory = customizer.getDefaultFolder(myProject);
-        }
       }
       catch (Exception e) {
         LOG.error("Exception during customization of the terminal session", e);