From c81c0bfdce96e1519db994b6ccff0643d7dfef47 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 17 Oct 2014 15:48:00 -0700
Subject: [PATCH] Breakpoints in break/continue statements

---
 src/services/breakpoints.ts                   |  8 +++
 .../reference/bpSpan_breakOrContinue.baseline | 71 +++++++++++++++++++
 .../breakpointValidationBreakOrContinue.ts    | 17 +++++
 3 files changed, 96 insertions(+)
 create mode 100644 tests/baselines/reference/bpSpan_breakOrContinue.baseline
 create mode 100644 tests/cases/fourslash/breakpointValidationBreakOrContinue.ts

diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index a2a19d89626..deb0a2275a4 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -93,6 +93,10 @@ module ts.BreakpointResolver {
                     case SyntaxKind.LabeledStatement:
                         return spanInLabeledStatement(<LabeledStatement>node);
 
+                    case SyntaxKind.BreakStatement:
+                    case SyntaxKind.ContinueStatement:
+                        return spanInBreakOrContinueStatement(<BreakOrContinueStatement>node);
+
                     // Tokens:
                     case SyntaxKind.SemicolonToken:
                     case SyntaxKind.EndOfFileToken:
@@ -265,6 +269,10 @@ module ts.BreakpointResolver {
             function spanInLabeledStatement(labeledStatement: LabeledStatement): TypeScript.TextSpan {
                 return spanInNode(labeledStatement.statement);
             }
+
+            function spanInBreakOrContinueStatement(breakOrContinueStatement: BreakOrContinueStatement): TypeScript.TextSpan {
+                return textSpan(breakOrContinueStatement, breakOrContinueStatement.label || breakOrContinueStatement.getChildAt(0));
+            }
             
             // Tokens:
             function spanInCommaToken(node: Node): TypeScript.TextSpan {
diff --git a/tests/baselines/reference/bpSpan_breakOrContinue.baseline b/tests/baselines/reference/bpSpan_breakOrContinue.baseline
new file mode 100644
index 00000000000..617589b9047
--- /dev/null
+++ b/tests/baselines/reference/bpSpan_breakOrContinue.baseline
@@ -0,0 +1,71 @@
+
+1  >while (true) {
+
+    ~~~~~~~~~~~~~~~                               => Pos: (0 to 14)  SpanInfo: {"start":0,"length":12}
+    >while (true)
+    >:=> (line 1, col 0) to (line 1, col 12)
+--------------------------------
+2  >    break;
+
+    ~~~~~~~~~~~                                   => Pos: (15 to 25)  SpanInfo: {"start":19,"length":5}
+    >break
+    >:=> (line 2, col 4) to (line 2, col 9)
+--------------------------------
+3  >}
+
+    ~~                                            => Pos: (26 to 27)  SpanInfo: {"start":19,"length":5}
+    >break
+    >:=> (line 2, col 4) to (line 2, col 9)
+--------------------------------
+4  >y: while (true) {
+
+    ~~~~~~~~~~~~~~~~~~                            => Pos: (28 to 45)  SpanInfo: {"start":31,"length":12}
+    >while (true)
+    >:=> (line 4, col 3) to (line 4, col 15)
+--------------------------------
+5  >    break y;
+
+    ~~~~~~~~~~~~~                                 => Pos: (46 to 58)  SpanInfo: {"start":50,"length":7}
+    >break y
+    >:=> (line 5, col 4) to (line 5, col 11)
+--------------------------------
+6  >}
+
+    ~~                                            => Pos: (59 to 60)  SpanInfo: {"start":50,"length":7}
+    >break y
+    >:=> (line 5, col 4) to (line 5, col 11)
+--------------------------------
+7  >while (true) {
+
+    ~~~~~~~~~~~~~~~                               => Pos: (61 to 75)  SpanInfo: {"start":61,"length":12}
+    >while (true)
+    >:=> (line 7, col 0) to (line 7, col 12)
+--------------------------------
+8  >    continue;
+
+    ~~~~~~~~~~~~~~                                => Pos: (76 to 89)  SpanInfo: {"start":80,"length":8}
+    >continue
+    >:=> (line 8, col 4) to (line 8, col 12)
+--------------------------------
+9  >}
+
+    ~~                                            => Pos: (90 to 91)  SpanInfo: {"start":80,"length":8}
+    >continue
+    >:=> (line 8, col 4) to (line 8, col 12)
+--------------------------------
+10 >z: while (true) {
+
+    ~~~~~~~~~~~~~~~~~~                            => Pos: (92 to 109)  SpanInfo: {"start":95,"length":12}
+    >while (true)
+    >:=> (line 10, col 3) to (line 10, col 15)
+--------------------------------
+11 >    continue z;
+
+    ~~~~~~~~~~~~~~~~                              => Pos: (110 to 125)  SpanInfo: {"start":114,"length":10}
+    >continue z
+    >:=> (line 11, col 4) to (line 11, col 14)
+--------------------------------
+12 >}
+    ~                                             => Pos: (126 to 126)  SpanInfo: {"start":114,"length":10}
+    >continue z
+    >:=> (line 11, col 4) to (line 11, col 14)
\ No newline at end of file
diff --git a/tests/cases/fourslash/breakpointValidationBreakOrContinue.ts b/tests/cases/fourslash/breakpointValidationBreakOrContinue.ts
new file mode 100644
index 00000000000..f3e92a88dfb
--- /dev/null
+++ b/tests/cases/fourslash/breakpointValidationBreakOrContinue.ts
@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts' />
+
+// @BaselineFile: bpSpan_breakOrContinue.baseline
+// @Filename: bpSpan_breakOrContinue.ts
+////while (true) {
+////    break;
+////}
+////y: while (true) {
+////    break y;
+////}
+////while (true) {
+////    continue;
+////}
+////z: while (true) {
+////    continue z;
+////}
+verify.baselineCurrentFileBreakpointLocations();
\ No newline at end of file