Fix usage of getConfiguration

src/vs/editor/common/services/modelServiceImpl.ts

@@ -272,7 +272,7 @@ export class ModelServiceImpl implements IModelService {
 	public getCreationOptions(language: string, resource: URI): editorCommon.ITextModelCreationOptions {
 		let creationOptions = this._modelCreationOptionsByLanguageAndResource[language + resource];
 		if (!creationOptions) {
-			creationOptions = ModelServiceImpl._readModelOptions(this._configurationService.getConfiguration(null, { overrideIdentifier: language, resource }));
+			creationOptions = ModelServiceImpl._readModelOptions(this._configurationService.getConfiguration({ overrideIdentifier: language, resource }));
 			this._modelCreationOptionsByLanguageAndResource[language + resource] = creationOptions;
 		}
 		return creationOptions;

src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts

@@ -68,7 +68,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		}
 
 		const useRipgrep = folderQueries.every(folderQuery => {
-			const folderConfig = this._configurationService.getConfiguration<ISearchConfiguration>(undefined, { resource: folderQuery.folder });
+			const folderConfig = this._configurationService.getConfiguration<ISearchConfiguration>({ resource: folderQuery.folder });
 			return folderConfig.search.useRipgrep;
 		});
 

src/vs/workbench/parts/files/browser/views/explorerView.ts

@@ -120,7 +120,7 @@ export class ExplorerView extends ViewsViewletPanel {
 
 	private getFileEventsExcludes(root?: URI): glob.IExpression {
 		const scope = root ? { resource: root } : void 0;
-		const configuration = this.configurationService.getConfiguration<IFilesConfiguration>(undefined, scope);
+		const configuration = this.configurationService.getConfiguration<IFilesConfiguration>(scope);
 
 		return (configuration && configuration.files && configuration.files.exclude) || Object.create(null);
 	}

src/vs/workbench/parts/files/browser/views/explorerViewer.ts

@@ -687,7 +687,7 @@ export class FileFilter implements IFilter {
 	public updateConfiguration(): boolean {
 		let needsRefresh = false;
 		this.contextService.getWorkspace().folders.forEach(folder => {
-			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>(undefined, { resource: folder.uri });
+			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>({ resource: folder.uri });
 			const excludesConfig = (configuration && configuration.files && configuration.files.exclude) || Object.create(null);
 			needsRefresh = needsRefresh || !objects.equals(this.hiddenExpressionPerRoot.get(folder.uri.toString()), excludesConfig);
 			this.hiddenExpressionPerRoot.set(folder.uri.toString(), objects.clone(excludesConfig)); // do not keep the config, as it gets mutated under our hoods

src/vs/workbench/parts/search/common/queryBuilder.ts

@@ -56,7 +56,7 @@ export class QueryBuilder {
 		}
 
 		const useRipgrep = !folderResources || folderResources.every(folder => {
-			const folderConfig = this.configurationService.getConfiguration<ISearchConfiguration>(undefined, { resource: folder });
+			const folderConfig = this.configurationService.getConfiguration<ISearchConfiguration>({ resource: folder });
 			return folderConfig.search.useRipgrep;
 		});
 
@@ -244,7 +244,7 @@ export class QueryBuilder {
 
 	private getFolderQueryForSearchPath(searchPath: ISearchPathPattern): IFolderQuery {
 		const folder = searchPath.searchPath;
-		const folderConfig = this.configurationService.getConfiguration<ISearchConfiguration>(undefined, { resource: folder });
+		const folderConfig = this.configurationService.getConfiguration<ISearchConfiguration>({ resource: folder });
 		return <IFolderQuery>{
 			folder,
 			includePattern: searchPath.pattern && patternListToIExpression([searchPath.pattern]),
@@ -253,7 +253,7 @@ export class QueryBuilder {
 	}
 
 	private getFolderQueryForRoot(folder: uri, options?: IQueryOptions): IFolderQuery {
-		const folderConfig = this.configurationService.getConfiguration<ISearchConfiguration>(undefined, { resource: folder });
+		const folderConfig = this.configurationService.getConfiguration<ISearchConfiguration>({ resource: folder });
 		return <IFolderQuery>{
 			folder,
 			excludePattern: this.getExcludesForFolder(folderConfig, options),

src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts

@@ -95,7 +95,7 @@ export class FileWatcher {
 
 		this.service.setRoots(this.contextService.getWorkspace().folders.map(folder => {
 			// Fetch the root's watcherExclude setting and return it
-			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>(undefined, {
+			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>({
 				resource: folder.uri
 			});
 			let ignored: string[] = [];

src/vs/workbench/services/history/browser/history.ts

@@ -224,7 +224,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
 	private getExcludes(root?: URI): IExpression {
 		const scope = root ? { resource: root } : void 0;
 
-		return getExcludes(this.configurationService.getConfiguration<ISearchConfiguration>(void 0, scope));
+		return getExcludes(this.configurationService.getConfiguration<ISearchConfiguration>(scope));
 	}
 
 	private registerListeners(): void {