From a98cefa456ef480bf40aee3245835eabf64eca9a Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Fri, 6 Dec 2024 12:45:11 +0100 Subject: [PATCH] [terminal] migrate `ShellTerminalWidget` to `terminalProjectScope` GitOrigin-RevId: 528b7fbd1da62a5de0aa4f6654c47de25beca564 --- .../org/jetbrains/plugins/terminal/ShellTerminalWidget.java | 5 +++-- .../terminal/classic/ClassicTerminalVfsRefreshService.kt | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/ShellTerminalWidget.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/ShellTerminalWidget.java index f7120c7b5a11..c56458ae3dca 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/ShellTerminalWidget.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/ShellTerminalWidget.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.terminal.action.RenameTerminalSessionActionKt; import org.jetbrains.plugins.terminal.action.TerminalSplitAction; -import org.jetbrains.plugins.terminal.classic.ClassicTerminalVfsRefreshService; import org.jetbrains.plugins.terminal.classic.ClassicTerminalVfsRefresher; import org.jetbrains.plugins.terminal.fus.TerminalUsageTriggerCollector; import org.jetbrains.plugins.terminal.util.TerminalUtilKt; @@ -37,6 +36,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; +import static org.jetbrains.plugins.terminal.util.TerminalCoroutineKt.terminalProjectScope; + public class ShellTerminalWidget extends JBTerminalWidget { private static final Logger LOG = Logger.getInstance(ShellTerminalWidget.class); @@ -64,7 +65,7 @@ public class ShellTerminalWidget extends JBTerminalWidget { super(project, settingsProvider, parent); myShellCommandHandlerHelper = new TerminalShellCommandHandlerHelper(this); - ClassicTerminalVfsRefresher refresher = project.getService(ClassicTerminalVfsRefreshService.class).create(this); + ClassicTerminalVfsRefresher refresher = new ClassicTerminalVfsRefresher(this, terminalProjectScope(project)); getTerminalPanel().addPreKeyEventHandler(e -> { if (e.getID() != KeyEvent.KEY_PRESSED) return; handleAnyKeyPressed(); diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/classic/ClassicTerminalVfsRefreshService.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/classic/ClassicTerminalVfsRefreshService.kt index fdb1602f1aae..6459b8df42f8 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/classic/ClassicTerminalVfsRefreshService.kt +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/classic/ClassicTerminalVfsRefreshService.kt @@ -3,7 +3,6 @@ package org.jetbrains.plugins.terminal.classic import com.intellij.ide.SaveAndSyncHandler import com.intellij.openapi.Disposable -import com.intellij.openapi.components.Service import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.registry.Registry import com.intellij.util.concurrency.annotations.RequiresEdt @@ -17,11 +16,6 @@ import java.util.concurrent.atomic.AtomicReference import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds -@Service(Service.Level.PROJECT) -internal class ClassicTerminalVfsRefreshService(private val coroutineScope: CoroutineScope) { - fun create(widget: ShellTerminalWidget): ClassicTerminalVfsRefresher = ClassicTerminalVfsRefresher(widget, coroutineScope) -} - internal class ClassicTerminalVfsRefresher(private val widget: ShellTerminalWidget, private val coroutineScope: CoroutineScope) { private val currentWatcherRef: AtomicReference = AtomicReference()