From 293ca60ffd224f8c4a2d4c9c17426b54adee8b1f Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Wed, 3 Aug 2016 11:07:57 -0700
Subject: [PATCH] Renamed span to textSpan to better follow other language
 service APIs

---
 src/harness/fourslash.ts |  6 +++---
 src/server/client.ts     |  2 +-
 src/services/services.ts | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 532dccd4f6b..be8f1877c8f 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -779,10 +779,10 @@ namespace FourSlash {
                     if (ranges && ranges.length > rangeIndex) {
                         const range = ranges[rangeIndex];
 
-                        const start = completions.span.start;
-                        const end = start + completions.span.length;
+                        const start = completions.textSpan.start;
+                        const end = start + completions.textSpan.length;
                         if (range.start !== start || range.end !== end) {
-                            this.raiseError(`Expected completion span for '${symbol}', ${stringify(completions.span)}, to cover range ${stringify(range)}`);
+                            this.raiseError(`Expected completion span for '${symbol}', ${stringify(completions.textSpan)}, to cover range ${stringify(range)}`);
                         }
                     }
                     else {
diff --git a/src/server/client.ts b/src/server/client.ts
index 03a370411d1..7af7be16f19 100644
--- a/src/server/client.ts
+++ b/src/server/client.ts
@@ -236,7 +236,7 @@ namespace ts.server {
             const endPosition = this.lineOffsetToPosition(fileName, response.span.end);
 
             return {
-                span: ts.createTextSpanFromBounds(startPosition, endPosition),
+                textSpan: ts.createTextSpanFromBounds(startPosition, endPosition),
                 entries: response.body
             };
         }
diff --git a/src/services/services.ts b/src/services/services.ts
index fd665908248..1ed91381469 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1482,7 +1482,7 @@ namespace ts {
     }
 
     export interface ImportCompletionInfo {
-        span: TextSpan;
+        textSpan: TextSpan;
         entries: ImportCompletionEntry[];
     }
 
@@ -4513,7 +4513,7 @@ namespace ts {
                     // Get all known external module names or complete a path to a module
                     return {
                         entries: getStringLiteralCompletionEntriesFromModuleNames(<StringLiteral>node),
-                        span: getDirectoryFragmentTextSpan((<StringLiteral>node).text, node.getStart() + 1)
+                        textSpan: getDirectoryFragmentTextSpan((<StringLiteral>node).text, node.getStart() + 1)
                     };
                 }
             }
@@ -4793,18 +4793,18 @@ namespace ts {
                     const scriptPath = getDirectoryPath(sourceFile.path);
                     if (kind === "path") {
                         // Give completions for a relative path
-                        const span: TextSpan = getDirectoryFragmentTextSpan(toComplete, range.pos + prefix.length);
+                        const textSpan: TextSpan = getDirectoryFragmentTextSpan(toComplete, range.pos + prefix.length);
                         return {
                             entries: getCompletionEntriesForDirectoryFragment(toComplete, scriptPath, getSupportedExtensions(program.getCompilerOptions()), /*includeExtensions*/true, sourceFile.path),
-                            span
+                            textSpan
                         };
                     }
                     else {
                         // Give completions based on the typings available
-                        const span: TextSpan = { start: range.pos + prefix.length, length: match[0].length - prefix.length };
+                        const textSpan: TextSpan = { start: range.pos + prefix.length, length: match[0].length - prefix.length };
                         return {
                             entries: getCompletionEntriesFromTypings(host, program.getCompilerOptions(), scriptPath),
-                            span
+                            textSpan
                         };
                     }
                 }