Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
997d65ca
Commit
997d65ca
authored
6 years ago
by
Sergey Simonchik
Browse files
Options
Download
Email Patches
Plain Diff
terminal: fix persistent tabs - do not close tabs from confirmation listener
parent
51897abb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalTabCloseListener.kt
+7
-2
...rg/jetbrains/plugins/terminal/TerminalTabCloseListener.kt
with
7 additions
and
2 deletions
+7
-2
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalTabCloseListener.kt
+
7
-
2
View file @
997d65ca
...
@@ -9,7 +9,7 @@ import com.intellij.openapi.application.ApplicationManager
...
@@ -9,7 +9,7 @@ import com.intellij.openapi.application.ApplicationManager
import
com.intellij.openapi.project.Project
import
com.intellij.openapi.project.Project
import
com.intellij.ui.content.Content
import
com.intellij.ui.content.Content
class
TerminalTabCloseListener
(
content
:
Content
,
class
TerminalTabCloseListener
(
val
content
:
Content
,
val
project
:
Project
)
:
BaseContentCloseListener
(
content
,
project
)
{
val
project
:
Project
)
:
BaseContentCloseListener
(
content
,
project
)
{
override
fun
disposeContent
(
content
:
Content
)
{
override
fun
disposeContent
(
content
:
Content
)
{
}
}
...
@@ -18,7 +18,8 @@ class TerminalTabCloseListener(content: Content,
...
@@ -18,7 +18,8 @@ class TerminalTabCloseListener(content: Content,
if
(
modal
||
ApplicationManager
.
getApplication
().
isDisposeInProgress
)
{
if
(
modal
||
ApplicationManager
.
getApplication
().
isDisposeInProgress
)
{
return
true
return
true
}
}
if
(!
TerminalView
.
getWidgetByContent
(
content
).
isSessionRunning
)
{
val
widget
=
TerminalView
.
getWidgetByContent
(
content
)
if
(
widget
==
null
||
!
widget
.
isSessionRunning
)
{
return
true
return
true
}
}
val
proxy
=
NopProcessHandler
().
apply
{
startNotify
()
}
val
proxy
=
NopProcessHandler
().
apply
{
startNotify
()
}
...
@@ -27,4 +28,8 @@ class TerminalTabCloseListener(content: Content,
...
@@ -27,4 +28,8 @@ class TerminalTabCloseListener(content: Content,
val
result
=
TerminateRemoteProcessDialog
.
show
(
project
,
"Terminal ${content.displayName}"
,
proxy
)
val
result
=
TerminateRemoteProcessDialog
.
show
(
project
,
"Terminal ${content.displayName}"
,
proxy
)
return
result
!=
null
return
result
!=
null
}
}
override
fun
canClose
(
project
:
Project
):
Boolean
{
return
project
===
this
.
project
&&
closeQuery
(
this
.
content
,
true
)
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help