Merge remote-tracking branch 'origin/master' into HEAD

VSCode · VSCode · commit 47a314c25fea · 2020-12-08T07:43:58.000Z
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -283,10 +283,10 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 
 			const filter: IFilter = { name: languageName, extensions: distinct(extensions).slice(0, 10).map(e => trim(e, '.')) };
 
-			if (ext && extensions.indexOf(ext) >= 0) {
+			if (ext && extensions.indexOf(ext) >= 0 && !matchingFilter) {
 				matchingFilter = filter;
 
-				return null; // matching filter will be added last to the top
+				return null; // first matching filter will be added to the top
 			}
 
 			return filter;

Original file line number	Diff line number	Diff line change
`@@ -283,10 +283,10 @@ export abstract class AbstractFileDialogService implements IFileDialogService {`
`283`	`283`
`284`	`284`	`const filter: IFilter = { name: languageName, extensions: distinct(extensions).slice(0, 10).map(e => trim(e, '.')) };`
`285`	`285`
`286`		`- if (ext && extensions.indexOf(ext) >= 0) {`
	`286`	`+ if (ext && extensions.indexOf(ext) >= 0 && !matchingFilter) {`
`287`	`287`	`matchingFilter = filter;`
`288`	`288`
`289`		`- return null; // matching filter will be added last to the top`
	`289`	`+ return null; // first matching filter will be added to the top`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`return filter;`