From 6fbf0d672cd76d14f1ac7b5342a09fa52fcab2de Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 17 Oct 2014 15:46:36 -0700
Subject: [PATCH] Breakpoints in labeled statements

---
 src/services/breakpoints.ts                           |  7 +++++++
 tests/baselines/reference/bpSpan_labeled.baseline     | 11 +++++++++++
 .../breakpointValidationLabeled.ts                    |  0
 3 files changed, 18 insertions(+)
 create mode 100644 tests/baselines/reference/bpSpan_labeled.baseline
 rename tests/cases/{fourslash_old => fourslash}/breakpointValidationLabeled.ts (100%)

diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index 4398b559f66..a2a19d89626 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -90,6 +90,9 @@ module ts.BreakpointResolver {
                     case SyntaxKind.IfStatement:
                         return spanInIfStatement(<IfStatement>node);
 
+                    case SyntaxKind.LabeledStatement:
+                        return spanInLabeledStatement(<LabeledStatement>node);
+
                     // Tokens:
                     case SyntaxKind.SemicolonToken:
                     case SyntaxKind.EndOfFileToken:
@@ -258,6 +261,10 @@ module ts.BreakpointResolver {
                 // set on if(..) span
                 return textSpan(ifStatement, findNextToken(ifStatement.expression, ifStatement));
             }
+
+            function spanInLabeledStatement(labeledStatement: LabeledStatement): TypeScript.TextSpan {
+                return spanInNode(labeledStatement.statement);
+            }
             
             // Tokens:
             function spanInCommaToken(node: Node): TypeScript.TextSpan {
diff --git a/tests/baselines/reference/bpSpan_labeled.baseline b/tests/baselines/reference/bpSpan_labeled.baseline
new file mode 100644
index 00000000000..8c2d23adedb
--- /dev/null
+++ b/tests/baselines/reference/bpSpan_labeled.baseline
@@ -0,0 +1,11 @@
+
+1  >x:
+
+    ~~~                                           => Pos: (0 to 2)  SpanInfo: {"start":3,"length":10}
+    >var b = 10
+    >:=> (line 2, col 0) to (line 2, col 10)
+--------------------------------
+2  >var b = 10;
+    ~~~~~~~~~~~                                   => Pos: (3 to 13)  SpanInfo: {"start":3,"length":10}
+    >var b = 10
+    >:=> (line 2, col 0) to (line 2, col 10)
\ No newline at end of file
diff --git a/tests/cases/fourslash_old/breakpointValidationLabeled.ts b/tests/cases/fourslash/breakpointValidationLabeled.ts
similarity index 100%
rename from tests/cases/fourslash_old/breakpointValidationLabeled.ts
rename to tests/cases/fourslash/breakpointValidationLabeled.ts