From 8350cd947290a9a8beb3ff643a1e3dd2342a9182 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Sat, 26 Jan 2013 17:05:11 +0100
Subject: [backport] SI-2968 Fix brace healing for `^case (class|object) {`

Squashed commit of the following:

commit 24828531f62ce05402c96c04d7096e82d5f4e3bf
Author: Jason Zaugg <jzaugg@gmail.com>
Date:   Sun Oct 21 23:34:35 2012 +0200

    SI-2968 Fix brace healing for `^case (class|object) {`

    The scanner coalesces the pair of tokens into CASEOBJECT or
    CASECLASS, but fails to set `offset` back to the start of `case`.
    Brace healing is then unable to correctly guess the location of
    the missing brace.

    This commit resets `offset` and `lastOffset`, as though
    caseobject were a single keyword. Only the former was neccessary
    to fix this bug; I haven't found a test that shows the need for
    the latter.
    (cherry picked from commit cbad218dba47d49a39897b86d467c384538fdd53)
---
 test/files/neg/t2968.check  | 10 ++++++++++
 test/files/neg/t2968.scala  | 26 ++++++++++++++++++++++++++
 test/files/neg/t2968b.check |  4 ++++
 test/files/neg/t2968b.scala |  7 +++++++
 4 files changed, 47 insertions(+)
 create mode 100644 test/files/neg/t2968.check
 create mode 100644 test/files/neg/t2968.scala
 create mode 100644 test/files/neg/t2968b.check
 create mode 100644 test/files/neg/t2968b.scala

(limited to 'test')

diff --git a/test/files/neg/t2968.check b/test/files/neg/t2968.check
new file mode 100644
index 0000000000..5d2387f98c
--- /dev/null
+++ b/test/files/neg/t2968.check
@@ -0,0 +1,10 @@
+t2968.scala:8: error: Missing closing brace `}' assumed here
+} // missing brace
+^
+t2968.scala:17: error: Missing closing brace `}' assumed here
+} // missing brace
+^
+t2968.scala:26: error: Missing closing brace `}' assumed here
+} // missing brace
+^
+three errors found
diff --git a/test/files/neg/t2968.scala b/test/files/neg/t2968.scala
new file mode 100644
index 0000000000..41c3a798a5
--- /dev/null
+++ b/test/files/neg/t2968.scala
@@ -0,0 +1,26 @@
+object t1 {
+	case object Const {
+	}
+
+	class Var
+	{
+
+} // missing brace
+
+object t2 {
+	case class Const() {
+	}
+
+	class Var
+	{
+
+} // missing brace
+
+object t3 {
+	final case class Const() {
+	}
+
+	class Var
+	{
+
+} // missing brace
diff --git a/test/files/neg/t2968b.check b/test/files/neg/t2968b.check
new file mode 100644
index 0000000000..36d25a2d12
--- /dev/null
+++ b/test/files/neg/t2968b.check
@@ -0,0 +1,4 @@
+t2968b.scala:7: error: '}' expected but eof found.
+// missing brace
+                ^
+one error found
diff --git a/test/files/neg/t2968b.scala b/test/files/neg/t2968b.scala
new file mode 100644
index 0000000000..422b618aba
--- /dev/null
+++ b/test/files/neg/t2968b.scala
@@ -0,0 +1,7 @@
+case class Const()
+{
+}
+
+class Var
+{
+// missing brace
-- 
cgit v1.2.3