@theia/terminal 1.75.0-next.8 → 1.75.0

package/src/browser/terminal-widget-impl.ts

@@ -152,7 +152,8 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
     @inject(TerminalWidgetOptions) options: TerminalWidgetOptions;
     @inject(ShellTerminalServerProxy) protected readonly shellTerminalServer: ShellTerminalServerProxy;
     @inject(TerminalWatcher) protected readonly terminalWatcher: TerminalWatcher;
-    @inject(ILogger) @named('terminal') protected readonly logger: ILogger;
+    @inject(ILogger) @named('terminal:TerminalWidgetImpl')
+    protected readonly logger: ILogger;
     @inject('terminal-dom-id') readonly _terminalDOMId: string;
     @inject(TerminalPreferences) protected readonly preferences: TerminalPreferences;
     @inject(ContributionProvider) @named(TerminalContribution) protected readonly terminalContributionProvider: ContributionProvider<TerminalContribution>;

package/src/node/base-terminal-server.ts

@@ -33,7 +33,8 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
 
     constructor(
         @inject(ProcessManager) protected readonly processManager: ProcessManager,
-        @inject(ILogger) @named('terminal') protected readonly logger: ILogger
+        @inject(ILogger) @named('terminal:BaseTerminalServer')
+        protected readonly logger: ILogger
     ) {
         processManager.onDelete(id => {
             const toDispose = this.terminalToDispose.get(id);
@@ -119,7 +120,7 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
         if (term && term instanceof TerminalProcess) {
             term.resize(cols, rows);
         } else {
-            console.warn("Couldn't resize terminal " + id + ", because it doesn't exist.");
+            this.logger.warn("Couldn't resize terminal " + id + ", because it doesn't exist.");
         }
     }
 

package/src/node/shell-integration-injector.ts

@@ -18,11 +18,15 @@ import path = require('path');
 import * as fs from 'fs';
 import { GeneralShellType, guessShellTypeFromExecutable } from '../common/shell-type';
 import { ShellProcess, ShellProcessOptions } from './shell-process';
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
+import { ILogger } from '@theia/core';
 
 @injectable()
 export class ShellIntegrationInjector {
 
+    @inject(ILogger) @named('terminal:ShellIntegrationInjector')
+    protected readonly logger: ILogger;
+
     protected readonly INTEGRATION_ROOT_DIR = 'shell-integrations';
 
     protected readonly BASH_RCFILE_FLAG = '--rcfile';
@@ -74,7 +78,7 @@ export class ShellIntegrationInjector {
     protected getShellIntegrationPath(relativePath: string): string | undefined {
         const fullPath = path.join(__dirname, this.INTEGRATION_ROOT_DIR, relativePath);
         if (!fs.existsSync(fullPath)) {
-            console.warn(`Shell integration file not found (application may not be bundled correctly): ${fullPath}`);
+            this.logger.warn(`Shell integration file not found (application may not be bundled correctly): ${fullPath}`);
             return undefined;
         }
         return fullPath;

package/src/node/shell-process.ts

@@ -64,7 +64,8 @@ export class ShellProcess extends TerminalProcess {
         @inject(ShellProcessOptions) options: ShellProcessOptions,
         @inject(ProcessManager) processManager: ProcessManager,
         @inject(MultiRingBuffer) ringBuffer: MultiRingBuffer,
-        @inject(ILogger) @named('terminal') logger: ILogger,
+        @inject(ILogger) @named('terminal:ShellProcess')
+        protected override readonly logger: ILogger,
         @inject(EnvironmentUtils) environmentUtils: EnvironmentUtils,
     ) {
         const env = { 'COLORTERM': 'truecolor' };

package/src/node/shell-terminal-server.ts

@@ -53,7 +53,8 @@ export class ShellTerminalServer extends BaseTerminalServer implements IShellTer
     constructor(
         @inject(ShellProcessFactory) protected readonly shellFactory: ShellProcessFactory,
         @inject(ProcessManager) processManager: ProcessManager,
-        @inject(ILogger) @named('terminal') logger: ILogger) {
+        @inject(ILogger) @named('terminal:ShellTerminalServer')
+        protected override readonly logger: ILogger) {
         super(processManager, logger);
     }
 

package/src/node/terminal-backend-contribution.ts

@@ -28,7 +28,7 @@ export class TerminalBackendContribution implements MessagingService.Contributio
     @inject(ProcessManager)
     protected readonly processManager: ProcessManager;
 
-    @inject(ILogger) @named('terminal')
+    @inject(ILogger) @named('terminal:TerminalBackendContribution')
     protected readonly logger: ILogger;
 
     configure(service: MessagingService): void {

package/src/node/terminal-server.ts

@@ -30,7 +30,8 @@ export class TerminalServer extends BaseTerminalServer implements ITerminalServe
 
     constructor(
         @inject(ProcessManager) processManager: ProcessManager,
-        @inject(ILogger) @named('terminal') logger: ILogger,
+        @inject(ILogger) @named('terminal:TerminalServer')
+        protected override readonly logger: ILogger,
     ) {
         super(processManager, logger);
     }