@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js

@@ -21,52 +21,38 @@ class LineRangeMapping {
         }
         const startDelta = extendedInputRange.startLineNumber - this.inputRange.startLineNumber;
         const endDelta = extendedInputRange.endLineNumberExclusive - this.inputRange.endLineNumberExclusive;
-        return (
-             (new LineRangeMapping(extendedInputRange,  (new LineRange(
-                this.outputRange.startLineNumber + startDelta,
-                this.outputRange.lineCount - startDelta + endDelta
-            ))))
-        );
+        return ( new LineRangeMapping(extendedInputRange, ( new LineRange(
+            this.outputRange.startLineNumber + startDelta,
+            this.outputRange.lineCount - startDelta + endDelta
+        ))));
     }
     join(other) {
-        return (
-             (new LineRangeMapping(
-                this.inputRange.join(other.inputRange),
-                this.outputRange.join(other.outputRange)
-            ))
-        );
+        return ( new LineRangeMapping(
+            this.inputRange.join(other.inputRange),
+            this.outputRange.join(other.outputRange)
+        ));
     }
     get resultingDeltaFromOriginalToModified() {
         return this.outputRange.endLineNumberExclusive - this.inputRange.endLineNumberExclusive;
     }
     toString() {
-        return `${( ( this.inputRange.toString()))} -> ${( ( this.outputRange.toString()))}`;
+        return `${( this.inputRange.toString())} -> ${( this.outputRange.toString())}`;
     }
     addOutputLineDelta(delta) {
-        return (
-             (new LineRangeMapping(this.inputRange, this.outputRange.delta(delta)))
-        );
+        return ( new LineRangeMapping(this.inputRange, this.outputRange.delta(delta)));
     }
     addInputLineDelta(delta) {
-        return (
-             (new LineRangeMapping(this.inputRange.delta(delta), this.outputRange))
-        );
+        return ( new LineRangeMapping(this.inputRange.delta(delta), this.outputRange));
     }
     reverse() {
-        return (
-             (new LineRangeMapping(this.outputRange, this.inputRange))
-        );
+        return ( new LineRangeMapping(this.outputRange, this.inputRange));
     }
 }
 class DocumentLineRangeMap {
     static betweenOutputs(inputToOutput1, inputToOutput2, inputLineCount) {
         const alignments = MappingAlignment.compute(inputToOutput1, inputToOutput2);
-        const mappings = ( (alignments.map(
-            (m) => ( (new LineRangeMapping(m.output1Range, m.output2Range)))
-        )));
-        return (
-             (new DocumentLineRangeMap(mappings, inputLineCount))
-        );
+        const mappings = ( alignments.map((m) => ( new LineRangeMapping(m.output1Range, m.output2Range))));
+        return ( new DocumentLineRangeMap(mappings, inputLineCount));
     }
     constructor(
     lineRangeMappings, inputLineCount) {
@@ -80,23 +66,16 @@ class DocumentLineRangeMap {
     project(lineNumber) {
         const lastBefore = findLast(this.lineRangeMappings, r => r.inputRange.startLineNumber <= lineNumber);
         if (!lastBefore) {
-            return (
-                 (new LineRangeMapping(
-                     (new LineRange(lineNumber, 1)),
-                     (new LineRange(lineNumber, 1))
-                ))
-            );
+            return ( new LineRangeMapping(( new LineRange(lineNumber, 1)), ( new LineRange(lineNumber, 1))));
         }
         if (lastBefore.inputRange.contains(lineNumber)) {
             return lastBefore;
         }
-        const containingRange = ( (new LineRange(lineNumber, 1)));
-        const mappedRange = ( (new LineRange(lineNumber +
+        const containingRange = ( new LineRange(lineNumber, 1));
+        const mappedRange = ( new LineRange(lineNumber +
             lastBefore.outputRange.endLineNumberExclusive -
-            lastBefore.inputRange.endLineNumberExclusive, 1)));
-        return (
-             (new LineRangeMapping(containingRange, mappedRange))
-        );
+            lastBefore.inputRange.endLineNumberExclusive, 1));
+        return ( new LineRangeMapping(containingRange, mappedRange));
     }
     get outputLineCount() {
         const last = lastOrDefault(this.lineRangeMappings);
@@ -104,31 +83,26 @@ class DocumentLineRangeMap {
         return this.inputLineCount + diff;
     }
     reverse() {
-        return (
-             (new DocumentLineRangeMap(
-                 (this.lineRangeMappings.map(r => r.reverse())),
-                this.outputLineCount
-            ))
-        );
+        return ( new DocumentLineRangeMap(( this.lineRangeMappings.map(r => r.reverse())), this.outputLineCount));
     }
 }
 class MappingAlignment {
     static compute(fromInputToOutput1, fromInputToOutput2) {
         const compareByStartLineNumber = compareBy((d) => d.inputRange.startLineNumber, numberComparator);
-        const combinedDiffs = concatArrays(( (fromInputToOutput1.map((diff) => ({ source: 0, diff })))), ( (fromInputToOutput2.map((diff) => ({ source: 1, diff }))))).sort(compareBy((d) => d.diff, compareByStartLineNumber));
-        const currentDiffs = [( (new Array())), ( (new Array()))];
+        const combinedDiffs = concatArrays(( fromInputToOutput1.map((diff) => ({ source: 0, diff }))), ( fromInputToOutput2.map((diff) => ({ source: 1, diff })))).sort(compareBy((d) => d.diff, compareByStartLineNumber));
+        const currentDiffs = [( new Array()), ( new Array())];
         const deltaFromBaseToInput = [0, 0];
-        const alignments = ( (new Array()));
+        const alignments = ( new Array());
         function pushAndReset(inputRange) {
-            const mapping1 = LineRangeMapping.join(currentDiffs[0]) || ( (new LineRangeMapping(inputRange, inputRange.delta(deltaFromBaseToInput[0]))));
-            const mapping2 = LineRangeMapping.join(currentDiffs[1]) || ( (new LineRangeMapping(inputRange, inputRange.delta(deltaFromBaseToInput[1]))));
-            alignments.push(( (new MappingAlignment(
+            const mapping1 = LineRangeMapping.join(currentDiffs[0]) || ( new LineRangeMapping(inputRange, inputRange.delta(deltaFromBaseToInput[0])));
+            const mapping2 = LineRangeMapping.join(currentDiffs[1]) || ( new LineRangeMapping(inputRange, inputRange.delta(deltaFromBaseToInput[1])));
+            alignments.push(( new MappingAlignment(
                 currentInputRange,
                 mapping1.extendInputRange(currentInputRange).outputRange,
                 currentDiffs[0],
                 mapping2.extendInputRange(currentInputRange).outputRange,
                 currentDiffs[1]
-            ))));
+            )));
             currentDiffs[0] = [];
             currentDiffs[1] = [];
         }
@@ -168,49 +142,39 @@ class DetailedLineRangeMapping extends LineRangeMapping {
         super(inputRange, outputRange);
         this.inputTextModel = inputTextModel;
         this.outputTextModel = outputTextModel;
-        this.rangeMappings = rangeMappings || [( (new RangeMapping(this.inputRange.toRange(), this.outputRange.toRange())))];
+        this.rangeMappings = rangeMappings || [( new RangeMapping(this.inputRange.toRange(), this.outputRange.toRange()))];
     }
     addOutputLineDelta(delta) {
-        return (
-             (new DetailedLineRangeMapping(
-                this.inputRange,
-                this.inputTextModel,
-                this.outputRange.delta(delta),
-                this.outputTextModel,
-                 (this.rangeMappings.map(d => d.addOutputLineDelta(delta)))
-            ))
-        );
+        return ( new DetailedLineRangeMapping(
+            this.inputRange,
+            this.inputTextModel,
+            this.outputRange.delta(delta),
+            this.outputTextModel,
+            ( this.rangeMappings.map(d => d.addOutputLineDelta(delta)))
+        ));
     }
     addInputLineDelta(delta) {
-        return (
-             (new DetailedLineRangeMapping(
-                this.inputRange.delta(delta),
-                this.inputTextModel,
-                this.outputRange,
-                this.outputTextModel,
-                 (this.rangeMappings.map(d => d.addInputLineDelta(delta)))
-            ))
-        );
+        return ( new DetailedLineRangeMapping(
+            this.inputRange.delta(delta),
+            this.inputTextModel,
+            this.outputRange,
+            this.outputTextModel,
+            ( this.rangeMappings.map(d => d.addInputLineDelta(delta)))
+        ));
     }
     join(other) {
-        return (
-             (new DetailedLineRangeMapping(
-                this.inputRange.join(other.inputRange),
-                this.inputTextModel,
-                this.outputRange.join(other.outputRange),
-                this.outputTextModel
-            ))
-        );
+        return ( new DetailedLineRangeMapping(
+            this.inputRange.join(other.inputRange),
+            this.inputTextModel,
+            this.outputRange.join(other.outputRange),
+            this.outputTextModel
+        ));
     }
     getLineEdit() {
-        return (
-             (new LineRangeEdit(this.inputRange, this.getOutputLines()))
-        );
+        return ( new LineRangeEdit(this.inputRange, this.getOutputLines()));
     }
     getReverseLineEdit() {
-        return (
-             (new LineRangeEdit(this.outputRange, this.getInputLines()))
-        );
+        return ( new LineRangeEdit(this.outputRange, this.getInputLines()));
     }
     getOutputLines() {
         return this.outputRange.getLines(this.outputTextModel);
@@ -231,29 +195,23 @@ class RangeMapping {
         return `${rangeToString(this.inputRange)} -> ${rangeToString(this.outputRange)}`;
     }
     addOutputLineDelta(deltaLines) {
-        return (
-             (new RangeMapping(this.inputRange,  (new Range(
-                this.outputRange.startLineNumber + deltaLines,
-                this.outputRange.startColumn,
-                this.outputRange.endLineNumber + deltaLines,
-                this.outputRange.endColumn
-            ))))
-        );
+        return ( new RangeMapping(this.inputRange, ( new Range(
+            this.outputRange.startLineNumber + deltaLines,
+            this.outputRange.startColumn,
+            this.outputRange.endLineNumber + deltaLines,
+            this.outputRange.endColumn
+        ))));
     }
     addInputLineDelta(deltaLines) {
-        return (
-             (new RangeMapping( (new Range(
-                this.inputRange.startLineNumber + deltaLines,
-                this.inputRange.startColumn,
-                this.inputRange.endLineNumber + deltaLines,
-                this.inputRange.endColumn
-            )), this.outputRange))
-        );
+        return ( new RangeMapping(( new Range(
+            this.inputRange.startLineNumber + deltaLines,
+            this.inputRange.startColumn,
+            this.inputRange.endLineNumber + deltaLines,
+            this.inputRange.endColumn
+        )), this.outputRange));
     }
     reverse() {
-        return (
-             (new RangeMapping(this.outputRange, this.inputRange))
-        );
+        return ( new RangeMapping(this.outputRange, this.inputRange));
     }
 }
 class DocumentRangeMap {
@@ -268,31 +226,25 @@ class DocumentRangeMap {
     project(position) {
         const lastBefore = findLast(this.rangeMappings, r => r.inputRange.getStartPosition().isBeforeOrEqual(position));
         if (!lastBefore) {
-            return (
-                 (new RangeMapping(
-                    Range.fromPositions(position, position),
-                    Range.fromPositions(position, position)
-                ))
-            );
+            return ( new RangeMapping(
+                Range.fromPositions(position, position),
+                Range.fromPositions(position, position)
+            ));
         }
         if (rangeContainsPosition(lastBefore.inputRange, position)) {
             return lastBefore;
         }
         const dist = lengthBetweenPositions(lastBefore.inputRange.getEndPosition(), position);
         const outputPos = addLength(lastBefore.outputRange.getEndPosition(), dist);
-        return (
-             (new RangeMapping(Range.fromPositions(position), Range.fromPositions(outputPos)))
-        );
+        return ( new RangeMapping(Range.fromPositions(position), Range.fromPositions(outputPos)));
     }
     projectRange(range) {
         const start = this.project(range.getStartPosition());
         const end = this.project(range.getEndPosition());
-        return (
-             (new RangeMapping(
-                start.inputRange.plusRange(end.inputRange),
-                start.outputRange.plusRange(end.outputRange)
-            ))
-        );
+        return ( new RangeMapping(
+            start.inputRange.plusRange(end.inputRange),
+            start.outputRange.plusRange(end.outputRange)
+        ));
     }
     get outputLineCount() {
         const last = lastOrDefault(this.rangeMappings);
@@ -300,12 +252,7 @@ class DocumentRangeMap {
         return this.inputLineCount + diff;
     }
     reverse() {
-        return (
-             (new DocumentRangeMap(
-                 (this.rangeMappings.map(m => m.reverse())),
-                this.outputLineCount
-            ))
-        );
+        return ( new DocumentRangeMap(( this.rangeMappings.map(m => m.reverse())), this.outputLineCount));
     }
 }
 export { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, MappingAlignment, RangeMapping };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -4,7 +4,7 @@ import { BugIndicatingError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { derived, waitForState, keepObserved, autorunHandleChanges, transaction, observableValue } from 'monaco-editor/esm/vs/base/common/observable.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IUndoRedoService, UndoRedoGroup } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
 import { EditorModel } from '../../../../common/editor/editorModel.js';
 import { LineRange } from './lineRange.js';
@@ -362,7 +362,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: 0 ,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localize('setInputHandled', "Set Input Handled")),
+            label: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel', 'setInputHandled', "Set Input Handled"),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -571,7 +571,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localize('undoMarkAsHandled', 'Undo Mark As Handled'));
+        this.label = localizeWithPath('vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel', 'undoMarkAsHandled', 'Undo Mark As Handled');
         this.type = 0 ;
     }
     redo() {

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,2 +1,44 @@
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+( new RawContextKey(
+ 'isMergeEditor',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'is', 'The editor is a merge editor') }
+));
+( new RawContextKey(
+ 'isMergeResultEditor',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'isr', 'The editor is a the result editor of a merge editor.') }
+));
+( new RawContextKey(
+ 'mergeEditorLayout',
+ 'mixed',
+ { type: 'string', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'editorLayout', 'The layout mode of a merge editor') }
+));
+( new RawContextKey(
+ 'mergeEditorShowBase',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'showBase', 'If the merge editor shows the base version') }
+));
+( new RawContextKey(
+ 'mergeEditorShowBaseAtTop',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'showBaseAtTop', 'If base should be shown at the top') }
+));
+( new RawContextKey(
+ 'mergeEditorShowNonConflictingChanges',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'showNonConflictingChanges', 'If the merge editor shows non-conflicting changes') }
+));
+( new RawContextKey(
+ 'mergeEditorBaseUri',
+ '',
+ { type: 'string', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'baseUri', 'The uri of the baser of a merge editor') }
+));
+( new RawContextKey(
+ 'mergeEditorResultUri',
+ '',
+ { type: 'string', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'resultUri', 'The uri of the result of a merge editor') }
+));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts };

package/vscode/src/vs/workbench/contrib/output/browser/output.contribution.js

@@ -32,10 +32,10 @@ ModesRegistry.registerLanguage({
     extensions: [],
     mimetypes: [LOG_MIME]
 });
-const outputViewIcon = registerIcon('output-view-icon', Codicon.output, ( nls.localize('outputViewIcon', 'View icon of the output view.')));
+const outputViewIcon = registerIcon('output-view-icon', Codicon.output, nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'outputViewIcon', 'View icon of the output view.'));
 const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: OUTPUT_VIEW_ID,
-    title: { value: ( nls.localize('output', "Output")), original: 'Output' },
+    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'output', "Output"), original: 'Output' },
     icon: outputViewIcon,
     order: 1,
     ctorDescriptor: ( new SyncDescriptor(
@@ -47,14 +47,14 @@ const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registe
 }, 1 , { doNotRegisterOpenCommand: true });
 ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
         id: OUTPUT_VIEW_ID,
-        name: ( nls.localize('output', "Output")),
+        name: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'output', "Output"),
         containerIcon: outputViewIcon,
         canMoveView: true,
         canToggleVisibility: false,
         ctorDescriptor: ( new SyncDescriptor(OutputViewPane)),
         openCommandActionDescriptor: {
             id: 'workbench.action.output.toggleOutput',
-            mnemonicTitle: ( nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output")),
+            mnemonicTitle: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', { key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output"),
             keybindings: {
                 primary: 2048  | 1024  | 51 ,
                 linux: {
@@ -84,7 +84,7 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: `workbench.output.action.switchBetweenOutputs`,
-                    title: ( nls.localize('switchBetweenOutputs.label', "Switch Output")),
+                    title: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'switchBetweenOutputs.label', "Switch Output"),
                 });
             }
             async run(accessor, channelId) {
@@ -96,7 +96,7 @@ let OutputContribution = class OutputContribution extends Disposable {
         const switchOutputMenu = ( new MenuId('workbench.output.menu.switchOutput'));
         this._register(MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
             submenu: switchOutputMenu,
-            title: ( nls.localize('switchToOutput.label', "Switch Output")),
+            title: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'switchToOutput.label', "Switch Output"),
             group: 'navigation',
             when: ( ContextKeyExpr.equals('view', OUTPUT_VIEW_ID)),
             order: 1,
@@ -144,8 +144,8 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.showOutputChannels',
-                    title: { value: ( nls.localize('showOutputChannels', "Show Output Channels...")), original: 'Show Output Channels...' },
-                    category: { value: ( nls.localize('output', "Output")), original: 'Output' },
+                    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'showOutputChannels', "Show Output Channels..."), original: 'Show Output Channels...' },
+                    category: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'output', "Output"), original: 'Output' },
                     f1: true
                 });
             }
@@ -171,7 +171,7 @@ let OutputContribution = class OutputContribution extends Disposable {
                 for (const { id, label } of coreChannels) {
                     entries.push({ id, label });
                 }
-                const entry = await quickInputService.pick(entries, { placeHolder: ( nls.localize('selectOutput', "Select Output Channel")) });
+                const entry = await quickInputService.pick(entries, { placeHolder: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'selectOutput', "Select Output Channel") });
                 if (entry) {
                     return outputService.showChannel(entry.id);
                 }
@@ -183,7 +183,7 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: `workbench.output.action.clearOutput`,
-                    title: { value: ( nls.localize('clearOutput.label', "Clear Output")), original: 'Clear Output' },
+                    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'clearOutput.label', "Clear Output"), original: 'Clear Output' },
                     category: Categories.View,
                     menu: [{
                             id: MenuId.ViewTitle,
@@ -204,7 +204,7 @@ let OutputContribution = class OutputContribution extends Disposable {
                 const activeChannel = outputService.getActiveChannel();
                 if (activeChannel) {
                     activeChannel.clear();
-                    aria.status(( nls.localize('outputCleared', "Output was cleared")));
+                    aria.status(nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'outputCleared', "Output was cleared"));
                 }
             }
         }));
@@ -214,8 +214,8 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: `workbench.output.action.toggleAutoScroll`,
-                    title: { value: ( nls.localize('toggleAutoScroll', "Toggle Auto Scrolling")), original: 'Toggle Auto Scrolling' },
-                    tooltip: ( nls.localize('outputScrollOff', "Turn Auto Scrolling Off")),
+                    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'toggleAutoScroll', "Toggle Auto Scrolling"), original: 'Toggle Auto Scrolling' },
+                    tooltip: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'outputScrollOff', "Turn Auto Scrolling Off"),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', OUTPUT_VIEW_ID)))),
@@ -226,7 +226,7 @@ let OutputContribution = class OutputContribution extends Disposable {
                     toggled: {
                         condition: CONTEXT_OUTPUT_SCROLL_LOCK,
                         icon: Codicon.unlock,
-                        tooltip: ( nls.localize('outputScrollOn', "Turn Auto Scrolling On"))
+                        tooltip: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'outputScrollOn', "Turn Auto Scrolling On")
                     }
                 });
             }
@@ -241,7 +241,7 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.openActiveLogOutputFile`,
-                    title: { value: ( nls.localize('openActiveLogOutputFile', "Open Log Output File")), original: 'Open Log Output File' },
+                    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'openActiveLogOutputFile', "Open Log Output File"), original: 'Open Log Output File' },
                     menu: [{
                             id: MenuId.ViewTitle,
                             when: ( ContextKeyExpr.equals('view', OUTPUT_VIEW_ID)),
@@ -284,7 +284,7 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.showLogs',
-                    title: { value: ( nls.localize('showLogs', "Show Logs...")), original: 'Show Logs...' },
+                    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'showLogs', "Show Logs..."), original: 'Show Logs...' },
                     category: Categories.Developer,
                     menu: {
                         id: MenuId.CommandPalette,
@@ -310,12 +310,12 @@ let OutputContribution = class OutputContribution extends Disposable {
                     entries.push({ id, label });
                 }
                 if (extensionLogs.length && logs.length) {
-                    entries.push({ type: 'separator', label: ( nls.localize('extensionLogs', "Extension Logs")) });
+                    entries.push({ type: 'separator', label: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'extensionLogs', "Extension Logs") });
                 }
                 for (const { id, label } of extensionLogs) {
                     entries.push({ id, label });
                 }
-                const entry = await quickInputService.pick(entries, { placeHolder: ( nls.localize('selectlog', "Select Log")) });
+                const entry = await quickInputService.pick(entries, { placeHolder: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'selectlog', "Select Log") });
                 if (entry) {
                     return outputService.showChannel(entry.id);
                 }
@@ -327,7 +327,7 @@ let OutputContribution = class OutputContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.openLogFile',
-                    title: { value: ( nls.localize('openLogFile', "Open Log File...")), original: 'Open Log File...' },
+                    title: { value: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'openLogFile', "Open Log File..."), original: 'Open Log File...' },
                     category: Categories.Developer,
                     menu: {
                         id: MenuId.CommandPalette,
@@ -337,10 +337,7 @@ let OutputContribution = class OutputContribution extends Disposable {
                         args: [{
                                 name: 'logFile',
                                 schema: {
-                                    markdownDescription: ( nls.localize(
-                                        'logFile',
-                                        "The id of the log file to open, for example `\"window\"`. Currently the best way to get this is to get the ID by checking the `workbench.action.output.show.<id>` commands"
-                                    )),
+                                    markdownDescription: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'logFile', "The id of the log file to open, for example `\"window\"`. Currently the best way to get this is to get the ID by checking the `workbench.action.output.show.<id>` commands"),
                                     type: 'string'
                                 }
                             }]
@@ -360,7 +357,7 @@ let OutputContribution = class OutputContribution extends Disposable {
                     entry = entries.find(e => e.id === argName);
                 }
                 if (!entry) {
-                    entry = await quickInputService.pick(entries, { placeHolder: ( nls.localize('selectlogFile', "Select Log File")) });
+                    entry = await quickInputService.pick(entries, { placeHolder: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'selectlogFile', "Select Log File") });
                 }
                 if (entry) {
                     const resource = assertIsDefined(entry.channel.file);
@@ -384,15 +381,12 @@ OutputContribution = ( __decorate([
 ( Registry.as(Extensions$2.Configuration)).registerConfiguration({
     id: 'output',
     order: 30,
-    title: ( nls.localize('output', "Output")),
+    title: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'output', "Output"),
     type: 'object',
     properties: {
         'output.smartScroll.enabled': {
             type: 'boolean',
-            description: ( nls.localize(
-                'output.smartScroll.enabled',
-                "Enable/disable the ability of smart scrolling in the output view. Smart scrolling allows you to lock scrolling automatically when you click in the output view and unlocks when you click in the last line."
-            )),
+            description: nls.localizeWithPath('vs/workbench/contrib/output/browser/output.contribution', 'output.smartScroll.enabled', "Enable/disable the ability of smart scrolling in the output view. Smart scrolling allows you to lock scrolling automatically when you click in the output view and unlocks when you click in the last line."),
             default: true,
             scope: 3 ,
             tags: ['output']

package/vscode/src/vs/workbench/contrib/output/browser/outputView.js

@@ -102,7 +102,7 @@ let OutputViewPane = class OutputViewPane extends ViewPane {
         this.editorPromise = null;
     }
     createInput(channel) {
-        return this.instantiationService.createInstance(TextResourceEditorInput, channel.uri, ( nls.localize('output model title', "{0} - Output", channel.label)), ( nls.localize('channel', "Output channel for '{0}'", channel.label)), undefined, undefined);
+        return this.instantiationService.createInstance(TextResourceEditorInput, channel.uri, nls.localizeWithPath('vs/workbench/contrib/output/browser/outputView', 'output model title', "{0} - Output", channel.label), nls.localizeWithPath('vs/workbench/contrib/output/browser/outputView', 'channel', "Output channel for '{0}'", channel.label), undefined, undefined);
     }
 };
 OutputViewPane = ( __decorate([
@@ -126,7 +126,7 @@ let OutputEditor = class OutputEditor extends AbstractTextResourceEditor {
         return OUTPUT_VIEW_ID;
     }
     getTitle() {
-        return ( nls.localize('output', "Output"));
+        return nls.localizeWithPath('vs/workbench/contrib/output/browser/outputView', 'output', "Output");
     }
     getConfigurationOverrides() {
         const options = super.getConfigurationOverrides();
@@ -160,7 +160,7 @@ let OutputEditor = class OutputEditor extends AbstractTextResourceEditor {
         return options;
     }
     getAriaLabel() {
-        return this.input ? this.input.getAriaLabel() : ( nls.localize('outputViewAriaLabel', "Output panel"));
+        return this.input ? this.input.getAriaLabel() : nls.localizeWithPath('vs/workbench/contrib/output/browser/outputView', 'outputViewAriaLabel', "Output panel");
     }
     async setInput(input, options, context, token) {
         const focus = !(options && options.preserveFocus);