mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
Build requires second argument to localize to be a string literal
This commit is contained in:
parent
2513c1b0a5
commit
d516c32ecb
|
@ -9,13 +9,6 @@ import * as path from 'path';
|
||||||
import { loadMessageBundle } from 'vscode-nls';
|
import { loadMessageBundle } from 'vscode-nls';
|
||||||
const localize = loadMessageBundle();
|
const localize = loadMessageBundle();
|
||||||
|
|
||||||
const messages = {
|
|
||||||
cursorNotInConflict: 'Editor cursor is not within a merge conflict',
|
|
||||||
cursorOnSplitterRange: 'Editor cursor is within the merge conflict splitter, please move it to either the "current" or "incoming" block',
|
|
||||||
noConflicts: 'No merge conflicts found in this file',
|
|
||||||
noOtherConflictsInThisFile: 'No other merge conflicts within this file'
|
|
||||||
};
|
|
||||||
|
|
||||||
interface IDocumentMergeConflictNavigationResults {
|
interface IDocumentMergeConflictNavigationResults {
|
||||||
canNavigate: boolean;
|
canNavigate: boolean;
|
||||||
conflict?: interfaces.IDocumentMergeConflict;
|
conflict?: interfaces.IDocumentMergeConflict;
|
||||||
|
@ -83,7 +76,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
|
|
||||||
// Still failed to find conflict, warn the user and exit
|
// Still failed to find conflict, warn the user and exit
|
||||||
if (!conflict) {
|
if (!conflict) {
|
||||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', messages.cursorNotInConflict));
|
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -113,7 +106,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
let conflict = await this.findConflictContainingSelection(editor);
|
let conflict = await this.findConflictContainingSelection(editor);
|
||||||
|
|
||||||
if (!conflict) {
|
if (!conflict) {
|
||||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', messages.cursorNotInConflict));
|
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,7 +124,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
typeToAccept = interfaces.CommitType.Incoming;
|
typeToAccept = interfaces.CommitType.Incoming;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
vscode.window.showWarningMessage(localize('cursorOnSplitterRange', messages.cursorOnSplitterRange));
|
vscode.window.showWarningMessage(localize('cursorOnSplitterRange', 'Editor cursor is within the merge conflict splitter, please move it to either the "current" or "incoming" block'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,11 +141,11 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
let navigationResult = await this.findConflictForNavigation(editor, direction);
|
let navigationResult = await this.findConflictForNavigation(editor, direction);
|
||||||
|
|
||||||
if (!navigationResult) {
|
if (!navigationResult) {
|
||||||
vscode.window.showWarningMessage(localize('noConflicts', messages.noConflicts));
|
vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (!navigationResult.canNavigate) {
|
else if (!navigationResult.canNavigate) {
|
||||||
vscode.window.showWarningMessage(localize('noOtherConflictsInThisFile', messages.noOtherConflictsInThisFile));
|
vscode.window.showWarningMessage(localize('noOtherConflictsInThisFile', 'No other merge conflicts within this file'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (!navigationResult.conflict) {
|
else if (!navigationResult.conflict) {
|
||||||
|
@ -179,7 +172,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!conflict) {
|
if (!conflict) {
|
||||||
vscode.window.showWarningMessage(localize('cursorNotInConflict', messages.cursorNotInConflict));
|
vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -192,7 +185,7 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
let conflicts = await this.tracker.getConflicts(editor.document);
|
let conflicts = await this.tracker.getConflicts(editor.document);
|
||||||
|
|
||||||
if (!conflicts || conflicts.length === 0) {
|
if (!conflicts || conflicts.length === 0) {
|
||||||
vscode.window.showWarningMessage(localize('noConflicts', messages.noConflicts));
|
vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue