Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vladimir.Orlov
2018-12-04 18:04:18 +03:00
2 changed files with 1 additions and 5 deletions
@@ -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
@@ -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);