Merge pull request #22178 from hoovercj/openWithContentLipstick

Follow up to PR #22021 to respond to feedback

extensions/vscode-api-tests/src/workspace.test.ts

@@ -100,8 +100,8 @@ suite('workspace-namespace', () => {
 		});
 	});
 
-	test('openTextDocument, untitled without path but language ID and contents', function () {
-		return workspace.openTextDocument({ language: 'html', contents: '<h1>Hello world!</h1>' }).then(doc => {
+	test('openTextDocument, untitled without path but language ID and content', function () {
+		return workspace.openTextDocument({ language: 'html', content: '<h1>Hello world!</h1>' }).then(doc => {
 			assert.equal(doc.uri.scheme, 'untitled');
 			assert.equal(doc.languageId, 'html');
 			assert.ok(doc.isDirty);

src/vs/vscode.d.ts

@@ -4080,12 +4080,12 @@ declare module 'vscode' {
 		/**
 		 * Opens an untitled text document. The editor will prompt the user for a file
 		 * path when the document is to be saved. The `options` parameter allows to
-		 * specify the *language* of the document.
+		 * specify the *language* and/or the *content* of the document.
 		 *
 		 * @param options Options to control how the document will be created.
 		 * @return A promise that resolves to a [document](#TextDocument).
 		 */
-		export function openTextDocument(options?: { language?: string; contents?: string; }): Thenable<TextDocument>;
+		export function openTextDocument(options?: { language?: string; content?: string; }): Thenable<TextDocument>;
 
 		/**
 		 * Register a text document content provider.

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -368,10 +368,10 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
 			set textDocuments(value) {
 				throw errors.readonly();
 			},
-			openTextDocument(uriOrFileNameOrOptions?: vscode.Uri | string | { language?: string; contents?: string; }) {
+			openTextDocument(uriOrFileNameOrOptions?: vscode.Uri | string | { language?: string; content?: string; }) {
 				let uriPromise: TPromise<URI>;
 
-				let options = uriOrFileNameOrOptions as { language?: string; contents?: string; };
+				let options = uriOrFileNameOrOptions as { language?: string; content?: string; };
 				if (!options || typeof options.language === 'string') {
 					uriPromise = extHostDocuments.createDocumentData(options);
 				} else if (typeof uriOrFileNameOrOptions === 'string') {

src/vs/workbench/api/node/extHost.protocol.ts

@@ -120,7 +120,7 @@ export abstract class MainThreadDiagnosticsShape {
 }
 
 export abstract class MainThreadDocumentsShape {
-	$tryCreateDocument(options?: { language?: string; contents?: string; }): TPromise<any> { throw ni(); }
+	$tryCreateDocument(options?: { language?: string; content?: string; }): TPromise<any> { throw ni(); }
 	$tryOpenDocument(uri: URI): TPromise<any> { throw ni(); }
 	$registerTextContentProvider(handle: number, scheme: string): void { throw ni(); }
 	$onVirtualDocumentChange(uri: URI, value: ITextSource): void { throw ni(); }

src/vs/workbench/api/node/extHostDocuments.ts

@@ -101,7 +101,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 		return promise;
 	}
 
-	public createDocumentData(options?: { language?: string; contents?: string }): TPromise<URI> {
+	public createDocumentData(options?: { language?: string; content?: string }): TPromise<URI> {
 		return this._proxy.$tryCreateDocument(options);
 	}
 

src/vs/workbench/api/node/mainThreadDocuments.ts

@@ -228,8 +228,8 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
 		});
 	}
 
-	$tryCreateDocument(options?: { language?: string, contents?: string }): TPromise<URI> {
-		return this._doCreateUntitled(void 0, options ? options.language : void 0, options ? options.contents : void 0);
+	$tryCreateDocument(options?: { language?: string, content?: string }): TPromise<URI> {
+		return this._doCreateUntitled(void 0, options ? options.language : void 0, options ? options.content : void 0);
 	}
 
 	private _handleAsResourceInput(uri: URI): TPromise<boolean> {