Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove hyphen in formatter-related messages #83538

Merged
merged 1 commit into from Oct 30, 2019
Merged

Remove hyphen in formatter-related messages #83538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
View file
Open in desktop
Expand Up @@ -106,7 +106,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId();
const silent = mode === FormattingMode.Silent;
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);

return new Promise<T | undefined>((resolve, reject) => {
Expand Down Expand Up @@ -134,7 +134,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
};
});
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) {
return undefined;
}
Expand Down Expand Up @@ -234,7 +234,7 @@ async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel,
} else if (pick === configurePick) {
// config default
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) {
configService.updateValue(DefaultFormatter.configName, formatters[pick.index].extensionId!.value, overrides);
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/format/browser/formatActionsNone.ts
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
return commandService.executeCommand('editor.action.formatDocument');
} else {
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 = {
label: nls.localize('install.formatter', "Install Formatter..."),
run: () => showExtensionQuery(viewletService, `category:formatters ${langName}`)
Expand Down