vala: Output multiline source-reference

Fixes https://gitlab.gnome.org/GNOME/vala/issues/764

diff --git a/vala/valareport.vala b/vala/valareport.vala
index 0aad89f1551471d539f8e2ce865f99e51561351d..8e480f03d45440a592136dbe1898e6810bfcf6f6 100644 (file)
--- a/vala/valareport.vala
+++ b/vala/valareport.vala
@@ -233,19 +233,29 @@ public class Vala.Report {
         */
        private void report_source (SourceReference source) {
                if (source.begin.line != source.end.line) {
-                       // FIXME Cannot report multi-line issues currently
+                       int idx;
+                       for (idx = source.begin.line - 2; idx < source.end.line + 2; ++idx) {
+                               string offending_line = source.file.get_source_line (idx);
+                               if (source.begin.line <= idx <= source.end.line) {
+                                       stderr.puts (caret_color_start);
+                                       stderr.printf (" >");
+                                       stderr.puts (caret_color_end);
+                               }
+                               stderr.printf ("  %s\n", offending_line);
+                       }
                        return;
                }
 
                string offending_line = source.file.get_source_line (source.begin.line);
 
                if (offending_line != null) {
-                       stderr.printf ("%s\n", offending_line);
+                       stderr.printf ("  %s\n", offending_line);
                        int idx;
 
                        /* We loop in this manner so that we don't fall over on differing
                         * tab widths. This means we get the ^s in the right places.
                         */
+                       stderr.printf ("  ");
                        for (idx = 1; idx < source.begin.column; ++idx) {
                                if (offending_line[idx - 1] == '\t') {
                                        stderr.printf ("\t");