@theia/debug 1.65.0-next.55 → 1.65.0

package/src/browser/debug-session-manager.ts

@@ -210,7 +210,7 @@ export class DebugSessionManager {
     }
 
     protected async startConfiguration(options: DebugConfigurationSessionOptions): Promise<DebugSession | undefined> {
-        return this.progressService.withProgress('Start...', 'debug', async () => {
+        return this.progressService.withProgress(nls.localizeByDefault('Starting...'), 'debug', async () => {
             try {
                 // If a parent session is available saving should be handled by the parent
                 if (!options.configuration.parentSessionId && !options.configuration.suppressSaveBeforeStart && !await this.saveAll()) {
@@ -258,11 +258,11 @@ export class DebugSessionManager {
                 return this.doStart(sessionId, resolved);
             } catch (e) {
                 if (DebugError.NotFound.is(e)) {
-                    this.messageService.error(`The debug session type "${e.data.type}" is not supported.`);
+                    this.messageService.error(nls.localize('theia/debug/debugSessionTypeNotSupported', 'The debug session type "{0}" is not supported.', e.data.type));
                     return undefined;
                 }
 
-                this.messageService.error('There was an error starting the debug session, check the logs for more details.');
+                this.messageService.error(nls.localize('theia/debug/errorStartingDebugSession', 'There was an error starting the debug session, check the logs for more details.'));
                 console.error('Error starting the debug session', e);
                 throw e;
             }
@@ -652,8 +652,9 @@ export class DebugSessionManager {
             return true;
         }
 
+        const taskLabel = typeof taskName === 'string' ? taskName : JSON.stringify(taskName);
         if (!taskInfo) {
-            return this.doPostTaskAction(`Could not run the task '${taskName}'.`);
+            return this.doPostTaskAction(nls.localize('theia/debug/couldNotRunTask', "Could not run the task '{0}'.", taskLabel));
         }
 
         const getExitCodePromise: Promise<TaskEndedInfo> = this.taskService.getExitCode(taskInfo.taskId).then(result =>
@@ -671,19 +672,24 @@ export class DebugSessionManager {
         if (taskEndedInfo.taskEndedType === TaskEndedTypes.TaskExited && taskEndedInfo.value === 0) {
             return true;
         } else if (taskEndedInfo.taskEndedType === TaskEndedTypes.TaskExited && taskEndedInfo.value !== undefined) {
-            return this.doPostTaskAction(`Task '${taskName}' terminated with exit code ${taskEndedInfo.value}.`);
+            return this.doPostTaskAction(nls.localize('theia/debug/taskTerminatedWithExitCode', "Task '{0}' terminated with exit code {1}.", taskLabel, taskEndedInfo.value));
         } else {
             const signal = await this.taskService.getTerminateSignal(taskInfo.taskId);
             if (signal !== undefined) {
-                return this.doPostTaskAction(`Task '${taskName}' terminated by signal ${signal}.`);
+                return this.doPostTaskAction(nls.localize('theia/debug/taskTerminatedBySignal', "Task '{0}' terminated by signal {1}.", taskLabel, signal));
             } else {
-                return this.doPostTaskAction(`Task '${taskName}' terminated for unknown reason.`);
+                return this.doPostTaskAction(nls.localize('theia/debug/taskTerminatedForUnknownReason', "Task '{0}' terminated for unknown reason.", taskLabel));
             }
         }
     }
 
     protected async doPostTaskAction(errorMessage: string): Promise<boolean> {
-        const actions = ['Open launch.json', 'Cancel', 'Configure Task', 'Debug Anyway'];
+        const actions = [
+            nls.localizeByDefault('Open {0}', 'launch.json'),
+            nls.localizeByDefault('Cancel'),
+            nls.localizeByDefault('Configure Task'),
+            nls.localizeByDefault('Debug Anyway')
+        ];
         const result = await this.messageService.error(errorMessage, ...actions);
         switch (result) {
             case actions[0]: // open launch.json

package/src/browser/debug-session.tsx

@@ -342,7 +342,7 @@ export class DebugSession implements CompositeTreeElement {
         try {
             const response = await this.connection.sendRequest('initialize', {
                 clientID: 'Theia',
-                clientName: 'Theia IDE',
+                clientName: nls.localize('theia/debug/TheiaIDE', 'Theia IDE'),
                 adapterID: this.configuration.type,
                 locale: 'en-US',
                 linesStartAt1: true,
@@ -364,7 +364,8 @@ export class DebugSession implements CompositeTreeElement {
         try {
             await this.sendRequest((this.configuration.request as keyof DebugRequestTypes), this.configuration);
         } catch (reason) {
-            this.showMessage(MessageType.Error, reason.message || 'Debug session initialization failed. See console for details.');
+            this.showMessage(MessageType.Error, reason.message || nls.localize('theia/debug/debugSessionInitializationFailed',
+                'Debug session initialization failed. See console for details.'));
             throw reason;
         }
     }

package/src/browser/disassembly-view/disassembly-view-contribution.ts

@@ -46,7 +46,7 @@ export class DisassemblyViewContribution extends AbstractViewContribution<Disass
     constructor() {
         super({
             widgetId: DisassemblyViewWidget.ID,
-            widgetName: 'Disassembly View',
+            widgetName: nls.localizeByDefault('Disassembly View'),
             defaultWidgetOptions: { area: 'main' }
         });
     }

package/src/browser/editor/debug-editor-model.ts

@@ -191,7 +191,7 @@ export class DebugEditorModel implements Disposable {
                 range: columnUntilEOLRange
             });
             const firstNonWhitespaceColumn = this.editor.document.textEditorModel.getLineFirstNonWhitespaceColumn(currentFrame.raw.line);
-            if (currentFrame.raw.column > firstNonWhitespaceColumn) {
+            if (firstNonWhitespaceColumn !== 0 && currentFrame.raw.column > firstNonWhitespaceColumn) {
                 decorations.push({
                     options: DebugEditorModel.TOP_STACK_FRAME_INLINE_DECORATION,
                     range: columnUntilEOLRange

package/src/browser/model/debug-breakpoint.tsx

@@ -23,6 +23,7 @@ import { TreeElement } from '@theia/core/lib/browser/source-tree';
 import { DebugSession } from '../debug-session';
 import { BaseBreakpoint } from '../breakpoint/breakpoint-marker';
 import { BreakpointManager } from '../breakpoint/breakpoint-manager';
+import { nls } from '@theia/core';
 
 export class DebugBreakpointData {
     readonly raw?: DebugProtocol.Breakpoint;
@@ -123,7 +124,7 @@ export abstract class DebugBreakpoint<T extends BaseBreakpoint = BaseBreakpoint>
         const decoration = this.getBreakpointDecoration();
         return {
             className: decoration.className + '-unverified',
-            message: [this.message || 'Unverified ' + decoration.message[0]]
+            message: [this.message || nls.localize('theia/debug/unverifiedBreakpoint', 'Unverified {0}', decoration.message[0])]
         };
     }
 
@@ -131,7 +132,7 @@ export abstract class DebugBreakpoint<T extends BaseBreakpoint = BaseBreakpoint>
         const decoration = this.getBreakpointDecoration();
         return {
             className: decoration.className + '-disabled',
-            message: [message || ('Disabled ' + decoration.message[0])]
+            message: [message || nls.localize('theia/debug/disabledBreakpoint', 'Disabled {0}', decoration.message[0])]
         };
     }
 

package/src/browser/model/debug-instruction-breakpoint.tsx

@@ -57,7 +57,7 @@ export class DebugInstructionBreakpoint extends DebugBreakpoint<InstructionBreak
         if (this.origin.condition || this.origin.hitCondition) {
             return {
                 className: 'codicon-debug-breakpoint-conditional',
-                message: message || [nls.localizeByDefault('Conditional Breakpoint...')]
+                message: message || [nls.localize('theia/debug/conditionalBreakpoint', 'Conditional Breakpoint')]
             };
         }
         return {

package/src/browser/model/debug-source-breakpoint.tsx

@@ -16,7 +16,7 @@
 
 import * as React from '@theia/core/shared/react';
 import { DebugProtocol } from '@vscode/debugprotocol/lib/debugProtocol';
-import { RecursivePartial } from '@theia/core';
+import { nls, RecursivePartial } from '@theia/core';
 import URI from '@theia/core/lib/common/uri';
 import { EditorWidget, Range } from '@theia/editor/lib/browser';
 import { TREE_NODE_INFO_CLASS, WidgetOpenerOptions } from '@theia/core/lib/browser';
@@ -163,21 +163,24 @@ export class DebugSourceBreakpoint extends DebugBreakpoint<SourceBreakpoint> imp
             const { session } = this;
             if (this.logMessage) {
                 if (session && !session.capabilities.supportsLogPoints) {
-                    return this.getUnsupportedBreakpointDecoration('Logpoints not supported by this debug type');
+                    return this.getUnsupportedBreakpointDecoration(nls.localize('theia/debug/logpointsNotSupported',
+                        'Logpoints not supported by this debug type'));
                 }
-                messages.push('Log Message: ' + this.logMessage);
+                messages.push(nls.localizeByDefault('Log Message: {0}', this.logMessage));
             }
             if (this.condition) {
                 if (session && !session.capabilities.supportsConditionalBreakpoints) {
-                    return this.getUnsupportedBreakpointDecoration('Conditional breakpoints not supported by this debug type');
+                    return this.getUnsupportedBreakpointDecoration(nls.localize('theia/debug/conditionalBreakpointsNotSupported',
+                        'Conditional breakpoints not supported by this debug type'));
                 }
-                messages.push('Expression: ' + this.condition);
+                messages.push(nls.localizeByDefault('Condition: {0}', this.condition));
             }
             if (this.hitCondition) {
                 if (session && !session.capabilities.supportsHitConditionalBreakpoints) {
-                    return this.getUnsupportedBreakpointDecoration('Hit conditional breakpoints not supported by this debug type');
+                    return this.getUnsupportedBreakpointDecoration(nls.localize('theia/debug/htiConditionalBreakpointsNotSupported',
+                        'Hit conditional breakpoints not supported by this debug type'));
                 }
-                messages.push('Hit Count: ' + this.hitCondition);
+                messages.push(nls.localizeByDefault('Hit Count: {0}', this.hitCondition));
             }
         }
         return super.doGetDecoration(messages);
@@ -194,18 +197,18 @@ export class DebugSourceBreakpoint extends DebugBreakpoint<SourceBreakpoint> imp
         if (this.logMessage) {
             return {
                 className: 'codicon-debug-breakpoint-log',
-                message: message || ['Logpoint']
+                message: message || [nls.localizeByDefault('Logpoint')]
             };
         }
         if (this.condition || this.hitCondition) {
             return {
                 className: 'codicon-debug-breakpoint-conditional',
-                message: message || ['Conditional Breakpoint']
+                message: message || [nls.localize('theia/debug/conditionalBreakpoint', 'Conditional Breakpoint')]
             };
         }
         return {
             className: 'codicon-debug-breakpoint',
-            message: message || ['Breakpoint']
+            message: message || [nls.localizeByDefault('Breakpoint')]
         };
     }
 

package/src/browser/model/debug-thread.tsx

@@ -127,7 +127,7 @@ export class DebugThread extends DebugThreadData implements TreeElement {
         const response: DebugProtocol.GotoTargetsResponse = await this.session.sendRequest('gotoTargets', { source, line: position.lineNumber, column: position.column });
 
         if (response && response.body.targets.length === 0) {
-            this.session.showMessage(MessageType.Warning, 'No executable code is associated at the current cursor position.');
+            this.session.showMessage(MessageType.Warning, nls.localizeByDefault('No executable code is associated at the current cursor position.'));
             return;
         }
 

package/src/browser/view/debug-stack-frames-source.tsx

@@ -20,6 +20,7 @@ import { TreeSource, TreeElement } from '@theia/core/lib/browser/source-tree';
 import { DebugThread } from '../model/debug-thread';
 import { DebugViewModel } from './debug-view-model';
 import debounce = require('p-debounce');
+import { nls } from '@theia/core';
 
 @injectable()
 export class DebugStackFramesSource extends TreeSource {
@@ -62,7 +63,7 @@ export class LoadMoreStackFrames implements TreeElement {
     ) { }
 
     render(): React.ReactNode {
-        return <span className='theia-load-more-frames'>Load More Stack Frames</span>;
+        return <span className='theia-load-more-frames'>{nls.localizeByDefault('Load More Stack Frames')}</span>;
     }
 
     async open(): Promise<void> {

package/src/browser/view/debug-view-model.ts

@@ -16,7 +16,7 @@
 
 import debounce from 'p-debounce';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Disposable, DisposableCollection, Event, Emitter, deepClone } from '@theia/core/lib/common';
+import { Disposable, DisposableCollection, Event, Emitter, deepClone, nls } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
 import { DebugSession, DebugState } from '../debug-session';
 import { DebugSessionManager } from '../debug-session-manager';
@@ -78,7 +78,7 @@ export class DebugViewModel implements Disposable {
         return this.session && this.session.id || '-1';
     }
     get label(): string {
-        return this.session && this.session.label || 'Unknown Session';
+        return this.session && this.session.label || nls.localize('theia/debug/unknownSession', 'Unknown Session');
     }
 
     @postConstruct()

package/src/common/debug-preferences.ts

@@ -51,12 +51,12 @@ export const debugPreferencesSchema: PreferenceSchema = {
             default: 'onFirstSessionStart'
         },
         'debug.confirmOnExit': {
-            description: 'Controls whether to confirm when the window closes if there are active debug sessions.',
+            description: nls.localizeByDefault('Controls whether to confirm when the window closes if there are active debug sessions.'),
             type: 'string',
             enum: ['never', 'always'],
             enumDescriptions: [
-                'Never confirm.',
-                'Always confirm if there are debug sessions.',
+                nls.localizeByDefault('Never confirm.'),
+                nls.localizeByDefault('Always confirm if there are debug sessions.'),
             ],
             default: 'never'
         },