test: add support for marking all visible context lines (#585)

Author: PeterCardenas

test/contexts_spec.lua

@@ -136,7 +136,11 @@ for _, lang in ipairs(langs_with_queries) do
 
           local act_context_rows = {} --- @type integer[]
           for _, r in ipairs(ranges) do
-            table.insert(act_context_rows, r[1])
+            local start_row = r[1]
+            local end_row = r[3]
+            for i = start_row, end_row - 1 do
+              table.insert(act_context_rows, i)
+            end
           end
 
           helpers.eq(

test/lang/test.adb

@@ -64,7 +64,7 @@ end Show_Increment;
 
 -- {{TEST}}
 type Date is -- {{CONTEXT}}
-  record
+  record -- {{CONTEXT}}
   Day : Integer range 1 .. 31;
 
   Month : Months := Jan;

test/lang/test.c

@@ -21,21 +21,29 @@ typedef enum { // {{CONTEXT}}
 // {{TEST}}
 
 int main(int arg1, // {{CONTEXT}}
-         char **arg2,
-         char **arg3)
-{
+         char **arg2, // {{CONTEXT}}
+         char **arg3) // {{CONTEXT}}
+{ // {{CONTEXT}}
 
   if (arg1 == 4 // {{CONTEXT}}
-      && arg2 == arg3) {
+      && arg2 == arg3) { // {{CONTEXT}}
+
+
+
 
     // {{CURSOR}}
 
     for (int i = 0; i < arg1; i++) { // {{CONTEXT}}
 
+
+
+
       // {{CURSOR}}
       while (1) { // {{CONTEXT}}
 
 
+
+
         // {{CURSOR}}
       }
 

test/lang/test.cpp

@@ -51,12 +51,12 @@ typedef enum { // {{CONTEXT}}
 
 // {{TEST}}
 int main(int arg1, // {{CONTEXT}}
-         char **arg2, // BUG: marking context here does not work
-         char **arg3
-         )
-{
+         char **arg2, // {{CONTEXT}}
+         char **arg3 // {{CONTEXT}}
+         ) // {{CONTEXT}}
+{ // {{CONTEXT}}
   if (arg1 == 4 // {{CONTEXT}}
-      && arg2 == arg3) {
+      && arg2 == arg3) { // {{CONTEXT}}
     for (int i = 0; i < arg1; i++) { // {{CONTEXT}}
       while (1) { // {{CONTEXT}}
 
@@ -71,7 +71,7 @@ int main(int arg1, // {{CONTEXT}}
   // {{POPCONTEXT}}
   // {{POPCONTEXT}}
   // {{POPCONTEXT}}
-
+  // {{POPCONTEXT}}
 
 
   do { // {{CONTEXT}}

test/lang/test.css

@@ -23,7 +23,7 @@
     } /* {{POPCONTEXT}} */
 
     @color-profile /* {{CONTEXT}} */
-    --swop5c { /* BUG: marking context here does not work */
+    --swop5c { /* {{CONTEXT}} */
 
 
 
@@ -37,7 +37,7 @@
         /* {{CURSOR}} */
 
     } /* {{POPCONTEXT}} */
-
+    /* {{POPCONTEXT}} */
 
 
 
@@ -80,14 +80,16 @@
 
 /* {{TEST}} */
 @media ( /* {{CONTEXT}} */
+/* {{CONTEXT}} */
+prefers-reduced-motion: reduce) { /* {{CONTEXT}} */
+
 
-prefers-reduced-motion: reduce) {
 
 
   /* {{CURSOR}} */
   *, /* {{CONTEXT}} */
-  *::before,
-  *::after {
+  *::before, /* {{CONTEXT}} */
+  *::after { /* {{CONTEXT}} */
     animation-duration: 0.01ms !important;
     animation-iteration-count: 1 !important;
     transition-duration: 0.01ms !important;
@@ -109,8 +111,8 @@ prefers-reduced-motion: reduce) {
     /* {{CURSOR}} */
 
   } /* {{POPCONTEXT}} */
-
-
+  /* {{POPCONTEXT}} */
+  /* {{POPCONTEXT}} */
 
 
 

test/lang/test.cu

@@ -58,12 +58,12 @@ __global__ void kernel(int *a, int *b, int *c) { // {{CONTEXT}}
 
 // {{TEST}}
 int main(int arg1, // {{CONTEXT}}
-         char **arg2,
-         char **arg3
-         )
-{
+         char **arg2, // {{CONTEXT}}
+         char **arg3 // {{CONTEXT}}
+         ) // {{CONTEXT}}
+{ // {{CONTEXT}}
   if (arg1 == 4 // {{CONTEXT}}
-      && arg2 == arg3) {
+      && arg2 == arg3) { // {{CONTEXT}}
     for (int i = 0; i < arg1; i++) { // {{CONTEXT}}
       while (1) { // {{CONTEXT}}
 
@@ -75,7 +75,7 @@ int main(int arg1, // {{CONTEXT}}
       } // {{POPCONTEXT}}
     } // {{POPCONTEXT}}
   } // {{POPCONTEXT}}
-
+  // {{POPCONTEXT}}
 
 
 

test/lang/test.d

@@ -1,6 +1,6 @@
 // {{TEST}}
 struct S // {{CONTEXT}}
-{
+{ // {{CONTEXT}}
 
 
 
@@ -31,7 +31,7 @@ enum Things { // {{CONTEXT}}
 }
 // {{TEST}}
 union U // {{CONTEXT}}
-{
+{ // {{CONTEXT}}
     ubyte i;
 
 
@@ -41,22 +41,22 @@ union U // {{CONTEXT}}
 }
 // {{TEST}}
 interface Bar // {{CONTEXT}}
-{
+{ // {{CONTEXT}}
 
 
 
     // {{CURSOR}}
 }
 // {{TEST}}
 class Foo : Bar // {{CONTEXT}}
-{
+{ // {{CONTEXT}}
 
 
 
     // {{CURSOR}}
     void bar (int a, // {{CONTEXT}}
-        int b)
-    {
+        int b) // {{CONTEXT}}
+    { // {{CONTEXT}}
 
     try { // {{CONTEXT}}
 

test/lang/test.dart

@@ -1,9 +1,9 @@
 // {{TEST}}
 @Deprecated('') // {{CONTEXT}}
-abstract // BUG: there should be context here
-class User 
-    extends 
-      Object {
+abstract // {{CONTEXT}}
+class User // {{CONTEXT}}
+    extends // {{CONTEXT}}
+      Object { // {{CONTEXT}}
   User(this.age);
   int age;
 
@@ -40,19 +40,19 @@ class User
 // {{TEST}}
 String(
   int magicalNumber,
-) { // {{CONTEXT}
+) { // {{CONTEXT}}
   if (magicalNumber == "69" // {{CONTEXT}}
-      // --
-      ||
-      magicalNumber == "420") {
+      // {{CONTEXT}}
+      || // {{CONTEXT}}
+      magicalNumber == "420") { // {{CONTEXT}}
     return 'pretty nice';
 
 
 
     // {{CURSOR}}
   } else if (magicalNumber == "420" // {{CONTEXT}}
-      &&
-      magicalNumber == "69") {
+      && // {{CONTEXT}}
+      magicalNumber == "69") { // {{CONTEXT}}
 
 
 
@@ -84,7 +84,7 @@ String(
 // {{TEST}}
 void catching() { // {{CONTEXT}}
   try // {{CONTEXT}}
-    // --
+    // {{CONTEXT}}
   {
 
 
@@ -129,8 +129,8 @@ void catching() { // {{CONTEXT}}
 // {{TEST}}
 void foring() { // {{CONTEXT}}
   for (int i = 0; // {{CONTEXT}}
-        i < 10;
-        i++) {
+        i < 10; // {{CONTEXT}}
+        i++) { // {{CONTEXT}}
 
 
 
@@ -146,9 +146,11 @@ void foring() { // {{CONTEXT}}
 
     // {{CURSOR}}
   } // {{POPCONTEXT}}
+  // {{POPCONTEXT}}
+  // {{POPCONTEXT}}
 
   while (true // {{CONTEXT}}
-  == false) {
+  == false) { // {{CONTEXT}}
 
 
 
@@ -168,6 +170,7 @@ void foring() { // {{CONTEXT}}
     // {{CURSOR}}
 
 } // {{POPCONTEXT}}
+// {{POPCONTEXT}}
 
   do { // {{CONTEXT}}
 
@@ -188,7 +191,7 @@ void foring() { // {{CONTEXT}}
 }
 // {{TEST}}
 extension ext // {{CONTEXT}}
-on int {
+on int { // {{CONTEXT}}
 
 
 

test/lang/test.f90

@@ -1,22 +1,23 @@
 ! {{TEST}}
 program ! {{CONTEXT}}
-    foo
+    foo ! {{CONTEXT}}
 
 
 
     ! {{CURSOR}}
     type ! {{CONTEXT}}
-        eigensys_t
+        eigensys_t ! {{CONTEXT}}
 
         real(idp) :: bar1(:,:)
 
 
 
         integer    :: n ! {{CURSOR}}
     end type eigensys_t ! {{POPCONTEXT}}
+    ! {{POPCONTEXT}}
 
     do i = 1, ! {{CONTEXT}}
-        eigensystem%n
+        eigensystem%n ! {{CONTEXT}}
 
         write(*,'(" Eigenvector ",I1,": ")') i
 
@@ -25,20 +26,20 @@
     end do ! {{POPCONTEXT}}
 
     contains
-    subroutine aaaaaaaa(foo, ! {{CONTEXT}}
+    subroutine aaaaaaaa(foo,
         bar)
 
-        if ( ! {{CONTEXT}}
+        if (
             foo /= 0) then
 
 
-            ! {{CURSOR}}
+
         else if (
             foo /= 1) then
 
 
             foo = foo + 1
-        else ! {{CONTEXT}}
+        else
 
             ! BUG: cannot mark cursor here
             bar = 2

test/lang/test.go

@@ -12,12 +12,12 @@ import ( // {{CONTEXT}}
 // {{TEST}}
 
 func (r *rect) area(a int, // {{CONTEXT}}
-b int) int {
+b int) int { // {{CONTEXT}}
     return r.width * r.height
 
-// {{CURSOR}}
 
 
+// {{CURSOR}}
 }
 
 var b
@@ -27,8 +27,8 @@ var b
 // {{TEST}}
 
 func foo(a int, // {{CONTEXT}}
-  b int) (int,
-  int) {
+  b int) (int, // {{CONTEXT}}
+  int) { // {{CONTEXT}}
 
     i := 1
 
@@ -38,9 +38,9 @@ func foo(a int, // {{CONTEXT}}
     case msg2 := <-c2: // {{CONTEXT}}
 
 
-      // {{CURSOR}}
 
 
+      // {{CURSOR}}
       fmt.Println("received", msg2)
   }