be relaxed when having one formatter and no config

jrieken · jrieken · commit 5cdd59f9c93f · 2019-03-27T18:28:41.000+01:00
diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
@@ -105,11 +105,12 @@ export abstract class FormattingConflicts {
 	}
 
 	static async select<T extends (DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider)>(formatter: T[], document: ITextModel, mode: FormattingMode): Promise<T | undefined> {
-		if (formatter.length > 1) {
-			const { value: selector } = FormattingConflicts._selectors.iterator().next();
-			if (selector) {
-				return await selector(formatter, document, mode);
-			}
+		if (formatter.length === 0) {
+			return undefined;
+		}
+		const { value: selector } = FormattingConflicts._selectors.iterator().next();
+		if (selector) {
+			return await selector(formatter, document, mode);
 		}
 		return formatter[0];
 	}
diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
@@ -78,6 +78,9 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
 				// good -> formatter configured and available
 				return defaultFormatter;
 			}
+		} else if (formatter.length === 1) {
+			// ok -> nothing configured but only one formatter available
+			return formatter[0];
 		}
 
 		const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId();

Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,12 @@ export abstract class FormattingConflicts {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`static async select<T extends (DocumentFormattingEditProvider \| DocumentRangeFormattingEditProvider)>(formatter: T[], document: ITextModel, mode: FormattingMode): Promise<T \| undefined> {`
`108`		`- if (formatter.length > 1) {`
`109`		`- const { value: selector } = FormattingConflicts._selectors.iterator().next();`
`110`		`- if (selector) {`
`111`		`- return await selector(formatter, document, mode);`
`112`		`- }`
	`108`	`+ if (formatter.length === 0) {`
	`109`	`+ return undefined;`
	`110`	`+ }`
	`111`	`+ const { value: selector } = FormattingConflicts._selectors.iterator().next();`
	`112`	`+ if (selector) {`
	`113`	`+ return await selector(formatter, document, mode);`
`113`	`114`	`}`
`114`	`115`	`return formatter[0];`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {`
`78`	`78`	`// good -> formatter configured and available`
`79`	`79`	`return defaultFormatter;`
`80`	`80`	`}`
	`81`	`+ } else if (formatter.length === 1) {`
	`82`	`+ // ok -> nothing configured but only one formatter available`
	`83`	`+ return formatter[0];`
`81`	`84`	`}`
`82`	`85`
`83`	`86`	`const langName = this._modeService.getLanguageName(document.getModeId()) \|\| document.getModeId();`