From 9cc4da7503997b406681431da3d43225c4c2d0bc Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 5 Mar 2020 12:10:29 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/features/rename.ts                    | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/extensions/typescript-language-features/src/features/rename.ts b/extensions/typescript-language-features/src/features/rename.ts
index 886cf420b74..db68acf38f3 100644
--- a/extensions/typescript-language-features/src/features/rename.ts
+++ b/extensions/typescript-language-features/src/features/rename.ts
@@ -8,7 +8,6 @@ import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import type * as Proto from '../protocol';
 import { ITypeScriptServiceClient, ServerResponse } from '../typescriptService';
-import API from '../utils/api';
 import * as typeConverters from '../utils/typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
 
@@ -26,7 +25,7 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 		token: vscode.CancellationToken
 	): Promise<vscode.Range | null> {
 		const response = await this.execRename(document, position, token);
-		if (!response || response.type !== 'response' || !response.body) {
+		if (response?.type !== 'response' || !response.body) {
 			return null;
 		}
 
@@ -35,11 +34,9 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 			return Promise.reject<vscode.Range>(renameInfo.localizedErrorMessage);
 		}
 
-		if (this.client.apiVersion.gte(API.v310)) {
-			const triggerSpan = renameInfo.triggerSpan;
-			if (triggerSpan) {
-				return typeConverters.Range.fromTextSpan(triggerSpan);
-			}
+		const triggerSpan = renameInfo.triggerSpan; // added in TS 3.1
+		if (triggerSpan) {
+			return typeConverters.Range.fromTextSpan(triggerSpan);
 		}
 
 		return null;
@@ -61,17 +58,15 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 			return Promise.reject<vscode.WorkspaceEdit>(renameInfo.localizedErrorMessage);
 		}
 
-
-		if (this.client.apiVersion.gte(API.v310)) {
-			if (renameInfo.fileToRename) {
-				const edits = await this.renameFile(renameInfo.fileToRename, newName, token);
-				if (edits) {
-					return edits;
-				} else {
-					return Promise.reject<vscode.WorkspaceEdit>(localize('fileRenameFail', "An error occurred while renaming file"));
-				}
+		if (renameInfo.fileToRename) {
+			const edits = await this.renameFile(renameInfo.fileToRename, newName, token);
+			if (edits) {
+				return edits;
+			} else {
+				return Promise.reject<vscode.WorkspaceEdit>(localize('fileRenameFail', "An error occurred while renaming file"));
 			}
 		}
+
 		return this.updateLocs(response.body.locs, newName);
 	}
 
@@ -104,11 +99,9 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 		const edit = new vscode.WorkspaceEdit();
 		for (const spanGroup of locations) {
 			const resource = this.client.toResource(spanGroup.file);
-			if (resource) {
-				for (const textSpan of spanGroup.locs as Proto.RenameTextSpan[]) {
-					edit.replace(resource, typeConverters.Range.fromTextSpan(textSpan),
-						(textSpan.prefixText || '') + newName + (textSpan.suffixText || ''));
-				}
+			for (const textSpan of spanGroup.locs) {
+				edit.replace(resource, typeConverters.Range.fromTextSpan(textSpan),
+					(textSpan.prefixText || '') + newName + (textSpan.suffixText || ''));
 			}
 		}
 		return edit;