From bc4057af858e0a50c4dffab9286eb24cc7114230 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 24 Feb 2015 13:03:14 -0800
Subject: [PATCH] breakpoint support for new import/export syntax

---
 src/services/breakpoints.ts                   | 10 +++++-
 .../reference/bpSpan_exports.baseline         | 17 +++++++++
 .../reference/bpSpan_imports.baseline         | 35 +++++++++++++++++++
 .../fourslash/breakpointValidationExports.ts  |  9 +++++
 .../fourslash/breakpointValidationImports.ts  | 12 +++++++
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/bpSpan_exports.baseline
 create mode 100644 tests/baselines/reference/bpSpan_imports.baseline
 create mode 100644 tests/cases/fourslash/breakpointValidationExports.ts
 create mode 100644 tests/cases/fourslash/breakpointValidationImports.ts

diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index a4943705e72..59c4e716890 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -178,7 +178,15 @@ module ts.BreakpointResolver {
 
                     case SyntaxKind.ImportEqualsDeclaration:
                         // import statement without including semicolon
-                        return textSpan(node,(<ImportEqualsDeclaration>node).moduleReference);
+                        return textSpan(node, (<ImportEqualsDeclaration>node).moduleReference);
+
+                    case SyntaxKind.ImportDeclaration:
+                        // import statement without including semicolon
+                        return textSpan(node, (<ImportDeclaration>node).moduleSpecifier);
+
+                    case SyntaxKind.ExportDeclaration:
+                        // import statement without including semicolon
+                        return textSpan(node, (<ExportDeclaration>node).moduleSpecifier);
 
                     case SyntaxKind.ModuleDeclaration:
                         // span on complete module if it is instantiated
diff --git a/tests/baselines/reference/bpSpan_exports.baseline b/tests/baselines/reference/bpSpan_exports.baseline
new file mode 100644
index 00000000000..1b09fb75a2f
--- /dev/null
+++ b/tests/baselines/reference/bpSpan_exports.baseline
@@ -0,0 +1,17 @@
+
+1  >export * from "a";
+
+    ~~~~~~~~~~~~~~~~~~~                           => Pos: (0 to 18)  SpanInfo: {"start":0,"length":17}
+    >export * from "a"
+    >:=> (line 1, col 0) to (line 1, col 17)
+--------------------------------
+2  >export {a as A} from "a";
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~                    => Pos: (19 to 44)  SpanInfo: {"start":19,"length":24}
+    >export {a as A} from "a"
+    >:=> (line 2, col 0) to (line 2, col 24)
+--------------------------------
+3  >export import e = require("a");
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~               => Pos: (45 to 75)  SpanInfo: {"start":45,"length":30}
+    >export import e = require("a")
+    >:=> (line 3, col 0) to (line 3, col 30)
\ No newline at end of file
diff --git a/tests/baselines/reference/bpSpan_imports.baseline b/tests/baselines/reference/bpSpan_imports.baseline
new file mode 100644
index 00000000000..c59f9faf904
--- /dev/null
+++ b/tests/baselines/reference/bpSpan_imports.baseline
@@ -0,0 +1,35 @@
+
+1  >import * as NS from "a";
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~                     => Pos: (0 to 24)  SpanInfo: {"start":0,"length":23}
+    >import * as NS from "a"
+    >:=> (line 1, col 0) to (line 1, col 23)
+--------------------------------
+2  >import {a as A} from "a";
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~                    => Pos: (25 to 50)  SpanInfo: {"start":25,"length":24}
+    >import {a as A} from "a"
+    >:=> (line 2, col 0) to (line 2, col 24)
+--------------------------------
+3  > import d from "a";
+
+    ~~~~~~~~~~~~~~~~~~~~                          => Pos: (51 to 70)  SpanInfo: {"start":52,"length":17}
+    >import d from "a"
+    >:=> (line 3, col 1) to (line 3, col 18)
+--------------------------------
+4  >import d2, {c, d as D} from "a";
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~             => Pos: (71 to 103)  SpanInfo: {"start":71,"length":31}
+    >import d2, {c, d as D} from "a"
+    >:=> (line 4, col 0) to (line 4, col 31)
+--------------------------------
+5  >import "a";
+
+    ~~~~~~~~~~~~                                  => Pos: (104 to 115)  SpanInfo: {"start":104,"length":10}
+    >import "a"
+    >:=> (line 5, col 0) to (line 5, col 10)
+--------------------------------
+6  >import e = require("a");
+    ~~~~~~~~~~~~~~~~~~~~~~~~                      => Pos: (116 to 139)  SpanInfo: {"start":116,"length":23}
+    >import e = require("a")
+    >:=> (line 6, col 0) to (line 6, col 23)
\ No newline at end of file
diff --git a/tests/cases/fourslash/breakpointValidationExports.ts b/tests/cases/fourslash/breakpointValidationExports.ts
new file mode 100644
index 00000000000..092d4fdc143
--- /dev/null
+++ b/tests/cases/fourslash/breakpointValidationExports.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @BaselineFile: bpSpan_exports.baseline
+// @Filename: bpSpan_exports.ts
+////export * from "a";
+////export {a as A} from "a";
+////export import e = require("a");
+
+verify.baselineCurrentFileBreakpointLocations();
\ No newline at end of file
diff --git a/tests/cases/fourslash/breakpointValidationImports.ts b/tests/cases/fourslash/breakpointValidationImports.ts
new file mode 100644
index 00000000000..c2ec25a1096
--- /dev/null
+++ b/tests/cases/fourslash/breakpointValidationImports.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @BaselineFile: bpSpan_imports.baseline
+// @Filename: bpSpan_imports.ts
+////import * as NS from "a";
+////import {a as A} from "a";
+//// import d from "a";
+////import d2, {c, d as D} from "a";
+////import "a";
+////import e = require("a");
+
+verify.baselineCurrentFileBreakpointLocations();
\ No newline at end of file