Span length is not optional (microsoft#18558)

Andy · web-flow · commit a4cf79baa5fd · 2017-09-25T09:47:53.000-07:00
* Span length is not optional

* Fix calculation of length
diff --git a/src/services/refactorProvider.ts b/src/services/refactorProvider.ts
@@ -43,4 +43,8 @@ namespace ts {
             return refactor && refactor.getEditsForAction(context, actionName);
         }
     }
+
+    export function getRefactorContextLength(context: RefactorContext): number {
+        return context.endPosition === undefined ? 0 : context.endPosition - context.startPosition;
+    }
 }
diff --git a/src/services/refactors/extractMethod.ts b/src/services/refactors/extractMethod.ts
@@ -14,7 +14,7 @@ namespace ts.refactor.extractMethod {
 
     /** Compute the associated code actions */
     function getAvailableActions(context: RefactorContext): ApplicableRefactorInfo[] | undefined {
-        const rangeToExtract = getRangeToExtract(context.file, { start: context.startPosition, length: context.endPosition - context.startPosition });
+        const rangeToExtract = getRangeToExtract(context.file, { start: context.startPosition, length: getRefactorContextLength(context) });
 
         const targetRange: TargetRange = rangeToExtract.targetRange;
         if (targetRange === undefined) {
@@ -66,8 +66,7 @@ namespace ts.refactor.extractMethod {
     }
 
     function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
-        const length = context.endPosition === undefined ? 0 : context.endPosition - context.startPosition;
-        const rangeToExtract = getRangeToExtract(context.file, { start: context.startPosition, length });
+        const rangeToExtract = getRangeToExtract(context.file, { start: context.startPosition, length: getRefactorContextLength(context) });
         const targetRange: TargetRange = rangeToExtract.targetRange;
 
         const parsedIndexMatch = /^scope_(\d+)$/.exec(actionName);
@@ -148,7 +147,7 @@ namespace ts.refactor.extractMethod {
      */
     // exported only for tests
     export function getRangeToExtract(sourceFile: SourceFile, span: TextSpan): RangeToExtract {
-        const length = span.length || 0;
+        const { length } = span;
 
         if (length === 0) {
             return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.StatementOrExpressionExpected)] };

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,8 @@ namespace ts {`
`43`	`43`	`return refactor && refactor.getEditsForAction(context, actionName);`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ export function getRefactorContextLength(context: RefactorContext): number {`
	`48`	`+ return context.endPosition === undefined ? 0 : context.endPosition - context.startPosition;`
	`49`	`+ }`
`46`	`50`	`}`