未验证 提交 8f3eeb49 编写于 作者: J Johannes Rieken 提交者: GitHub

Merge pull request #83538 from gjsjohnmurray/fix-83452

Remove hyphen in formatter-related messages
...@@ -106,7 +106,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution { ...@@ -106,7 +106,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId(); const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId();
const silent = mode === FormattingMode.Silent; const silent = mode === FormattingMode.Silent;
const message = !defaultFormatterId const message = !defaultFormatterId
? nls.localize('config.needed', "There are multiple formatters for {0}-files. Select a default formatter to continue.", DefaultFormatter._maybeQuotes(langName)) ? nls.localize('config.needed', "There are multiple formatters for '{0}' files. Select a default formatter to continue.", DefaultFormatter._maybeQuotes(langName))
: nls.localize('config.bad', "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.", defaultFormatterId); : nls.localize('config.bad', "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.", defaultFormatterId);
return new Promise<T | undefined>((resolve, reject) => { return new Promise<T | undefined>((resolve, reject) => {
...@@ -134,7 +134,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution { ...@@ -134,7 +134,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
}; };
}); });
const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId(); const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId();
const pick = await this._quickInputService.pick(picks, { placeHolder: nls.localize('select', "Select a default formatter for {0}-files", DefaultFormatter._maybeQuotes(langName)) }); const pick = await this._quickInputService.pick(picks, { placeHolder: nls.localize('select', "Select a default formatter for '{0}' files", DefaultFormatter._maybeQuotes(langName)) });
if (!pick || !formatter[pick.index].extensionId) { if (!pick || !formatter[pick.index].extensionId) {
return undefined; return undefined;
} }
...@@ -234,7 +234,7 @@ async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel, ...@@ -234,7 +234,7 @@ async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel,
} else if (pick === configurePick) { } else if (pick === configurePick) {
// config default // config default
const langName = modeService.getLanguageName(model.getModeId()) || model.getModeId(); const langName = modeService.getLanguageName(model.getModeId()) || model.getModeId();
const pick = await quickPickService.pick(picks, { placeHolder: nls.localize('select', "Select a default formatter for {0}-files", DefaultFormatter._maybeQuotes(langName)) }); const pick = await quickPickService.pick(picks, { placeHolder: nls.localize('select', "Select a default formatter for '{0}' files", DefaultFormatter._maybeQuotes(langName)) });
if (pick && formatters[pick.index].extensionId) { if (pick && formatters[pick.index].extensionId) {
configService.updateValue(DefaultFormatter.configName, formatters[pick.index].extensionId!.value, overrides); configService.updateValue(DefaultFormatter.configName, formatters[pick.index].extensionId!.value, overrides);
} }
......
...@@ -50,7 +50,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction { ...@@ -50,7 +50,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
return commandService.executeCommand('editor.action.formatDocument'); return commandService.executeCommand('editor.action.formatDocument');
} else { } else {
const langName = model.getLanguageIdentifier().language; const langName = model.getLanguageIdentifier().language;
const message = nls.localize('no.provider', "There is no formatter for '{0}'-files installed.", langName); const message = nls.localize('no.provider', "There is no formatter for '{0}' files installed.", langName);
const choice = { const choice = {
label: nls.localize('install.formatter', "Install Formatter..."), label: nls.localize('install.formatter', "Install Formatter..."),
run: () => showExtensionQuery(viewletService, `category:formatters ${langName}`) run: () => showExtensionQuery(viewletService, `category:formatters ${langName}`)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册