Fixes microsoft#70490: resource is mandatory in ITextResourcePropertiesService

alexdima · alexdima · commit bcc9532c1e82 · 2020-03-02T22:23:25.000+01:00
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -207,11 +207,22 @@ export class ModelServiceImpl extends Disposable implements IModelService {
 		};
 	}
 
+	private _getEOL(resource: URI | undefined, language: string): string {
+		if (resource) {
+			return this._resourcePropertiesService.getEOL(resource, language);
+		}
+		const eol = this._configurationService.getValue<string>('files.eol', { overrideIdentifier: language });
+		if (eol && eol !== 'auto') {
+			return eol;
+		}
+		return platform.OS === platform.OperatingSystem.Linux || platform.OS === platform.OperatingSystem.Macintosh ? '\n' : '\r\n';
+	}
+
 	public getCreationOptions(language: string, resource: URI | undefined, isForSimpleWidget: boolean): ITextModelCreationOptions {
 		let creationOptions = this._modelCreationOptionsByLanguageAndResource[language + resource];
 		if (!creationOptions) {
 			const editor = this._configurationService.getValue<IRawEditorConfig>('editor', { overrideIdentifier: language, resource });
-			const eol = this._resourcePropertiesService.getEOL(resource, language);
+			const eol = this._getEOL(resource, language);
 			creationOptions = ModelServiceImpl._readModelOptions({ editor, eol }, isForSimpleWidget);
 			this._modelCreationOptionsByLanguageAndResource[language + resource] = creationOptions;
 		}
diff --git a/src/vs/editor/common/services/textResourceConfigurationService.ts b/src/vs/editor/common/services/textResourceConfigurationService.ts
@@ -75,5 +75,5 @@ export interface ITextResourcePropertiesService {
 	/**
 	 * Returns the End of Line characters for the given resource
 	 */
-	getEOL(resource: URI | undefined, language?: string): string;
+	getEOL(resource: URI, language?: string): string;
 }

Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,5 @@ export interface ITextResourcePropertiesService {`
`75`	`75`	`/**`
`76`	`76`	`* Returns the End of Line characters for the given resource`
`77`	`77`	`*/`
`78`		`- getEOL(resource: URI \| undefined, language?: string): string;`
	`78`	`+ getEOL(resource: URI, language?: string): string;`
`79`	`79`	`}`