rename it to prepareRename, microsoft#48700

jrieken · jrieken · commit 6f4d130ae536 · 2018-04-26T18:04:10.000+02:00
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -2764,7 +2764,7 @@ declare module 'vscode' {
 		 * @param token A cancellation token.
 		 * @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
 		 */
-		resolveRenameLocation?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range, placeholder: string }>;
+		prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range, placeholder: string }>;
 	}
 
 	/**
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -471,7 +471,7 @@ class NavigateTypeAdapter {
 class RenameAdapter {
 
 	static supportsResolving(provider: vscode.RenameProvider): boolean {
-		return typeof provider.resolveRenameLocation === 'function';
+		return typeof provider.prepareRename === 'function';
 	}
 
 	private _documents: ExtHostDocuments;
@@ -511,14 +511,14 @@ class RenameAdapter {
 	}
 
 	resolveRenameLocation(resource: URI, position: IPosition): TPromise<modes.RenameLocation> {
-		if (typeof this._provider.resolveRenameLocation !== 'function') {
+		if (typeof this._provider.prepareRename !== 'function') {
 			return TPromise.as(undefined);
 		}
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = TypeConverters.toPosition(position);
 
-		return asWinJsPromise(token => this._provider.resolveRenameLocation(doc, pos, token)).then(rangeOrLocation => {
+		return asWinJsPromise(token => this._provider.prepareRename(doc, pos, token)).then(rangeOrLocation => {
 
 			let range: vscode.Range;
 			let text: string;

Original file line number	Diff line number	Diff line change
`@@ -2764,7 +2764,7 @@ declare module 'vscode' {`
`2764`	`2764`	`* @param token A cancellation token.`
`2765`	`2765`	* @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
`2766`	`2766`	`*/`
`2767`		`- resolveRenameLocation?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range \| { range: Range, placeholder: string }>;`
	`2767`	`+ prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range \| { range: Range, placeholder: string }>;`
`2768`	`2768`	`}`
`2769`	`2769`
`2770`	`2770`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ class NavigateTypeAdapter {`
`471`	`471`	`class RenameAdapter {`
`472`	`472`
`473`	`473`	`static supportsResolving(provider: vscode.RenameProvider): boolean {`
`474`		`- return typeof provider.resolveRenameLocation === 'function';`
	`474`	`+ return typeof provider.prepareRename === 'function';`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`private _documents: ExtHostDocuments;`
`@@ -511,14 +511,14 @@ class RenameAdapter {`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`resolveRenameLocation(resource: URI, position: IPosition): TPromise<modes.RenameLocation> {`
`514`		`- if (typeof this._provider.resolveRenameLocation !== 'function') {`
	`514`	`+ if (typeof this._provider.prepareRename !== 'function') {`
`515`	`515`	`return TPromise.as(undefined);`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`let doc = this._documents.getDocumentData(resource).document;`
`519`	`519`	`let pos = TypeConverters.toPosition(position);`
`520`	`520`
`521`		`- return asWinJsPromise(token => this._provider.resolveRenameLocation(doc, pos, token)).then(rangeOrLocation => {`
	`521`	`+ return asWinJsPromise(token => this._provider.prepareRename(doc, pos, token)).then(rangeOrLocation => {`
`522`	`522`
`523`	`523`	`let range: vscode.Range;`
`524`	`524`	`let text: string;`