Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

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

@@ -18,7 +18,7 @@ export interface IDiffComputationResult {
 }
 
 export interface IEditorWorkerService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	canComputeDiff(original: URI, modified: URI): boolean;
 	computeDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IDiffComputationResult | null>;

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

@@ -8,7 +8,6 @@ import { Disposable, IDisposable, dispose, toDisposable, DisposableStore } from
 import { URI } from 'vs/base/common/uri';
 import { SimpleWorkerClient, logOnceWebWorkerWarning, IWorkerClient } from 'vs/base/common/worker/simpleWorker';
 import { DefaultWorkerFactory } from 'vs/base/worker/defaultWorkerFactory';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
@@ -46,7 +45,7 @@ function canSyncModel(modelService: IModelService, resource: URI): boolean {
 }
 
 export class EditorWorkerServiceImpl extends Disposable implements IEditorWorkerService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private readonly _modelService: IModelService;
 	private readonly _workerManager: WorkerManager;
@@ -146,7 +145,7 @@ class WordBasedCompletionItemProvider implements modes.CompletionItemProvider {
 	}
 
 	provideCompletionItems(model: ITextModel, position: Position): Promise<modes.CompletionList | null> | undefined {
-		const { wordBasedSuggestions } = this._configurationService.getValue<IEditorOptions>(model.uri, position, 'editor');
+		const { wordBasedSuggestions } = this._configurationService.getValue<{ wordBasedSuggestions?: boolean }>(model.uri, position, 'editor');
 		if (!wordBasedSuggestions) {
 			return undefined;
 		}

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

@@ -61,7 +61,7 @@ class MarkerDecorations extends Disposable {
 
 export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly _onDidChangeMarker = this._register(new Emitter<ITextModel>());
 	readonly onDidChangeMarker: Event<ITextModel> = this._onDidChangeMarker.event;

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

@@ -12,7 +12,7 @@ import { Range } from 'vs/editor/common/core/range';
 export const IMarkerDecorationsService = createDecorator<IMarkerDecorationsService>('markerDecorationsService');
 
 export interface IMarkerDecorationsService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	onDidChangeMarker: Event<ITextModel>;
 

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

@@ -28,7 +28,7 @@ export interface ILanguageSelection extends IDisposable {
 }
 
 export interface IModeService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	onDidCreateMode: Event<IMode>;
 

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

@@ -40,7 +40,7 @@ class LanguageSelection extends Disposable implements ILanguageSelection {
 }
 
 export class ModeServiceImpl implements IModeService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private readonly _instantiatedModes: { [modeId: string]: IMode; };
 	private readonly _registry: LanguagesRegistry;

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

@@ -12,7 +12,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 export const IModelService = createDecorator<IModelService>('modelService');
 
 export interface IModelService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	createModel(value: string | ITextBufferFactory, languageSelection: ILanguageSelection | null, resource?: URI, isForSimpleWidget?: boolean): ITextModel;
 

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

@@ -88,7 +88,7 @@ interface IRawConfig {
 const DEFAULT_EOL = (platform.isLinux || platform.isMacintosh) ? DefaultEndOfLine.LF : DefaultEndOfLine.CRLF;
 
 export class ModelServiceImpl extends Disposable implements IModelService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private readonly _configurationService: IConfigurationService;
 	private readonly _configurationServiceSubscription: IDisposable;

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

@@ -12,7 +12,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 export const ITextModelService = createDecorator<ITextModelService>('textModelService');
 
 export interface ITextModelService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	/**
 	 * Provided a resource URI, it will return a model reference

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

@@ -13,7 +13,7 @@ export const ITextResourceConfigurationService = createDecorator<ITextResourceCo
 
 export interface ITextResourceConfigurationService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	/**
 	 * Event that fires when the configuration changes.
@@ -38,7 +38,7 @@ export const ITextResourcePropertiesService = createDecorator<ITextResourcePrope
 
 export interface ITextResourcePropertiesService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	/**
 	 * Returns the End of Line characters for the given resource

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

@@ -14,7 +14,7 @@ import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/co
 
 export class TextResourceConfigurationService extends Disposable implements ITextResourceConfigurationService {
 
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private readonly _onDidChangeConfiguration: Emitter<IConfigurationChangeEvent> = this._register(new Emitter<IConfigurationChangeEvent>());
 	public readonly onDidChangeConfiguration: Event<IConfigurationChangeEvent> = this._onDidChangeConfiguration.event;