Merge pull request #1912 from BuckleScript/reason_file_error_in_reason_syntax

turn on reason errors automatically for re/rei files

Author: bobzhang

jscomp/bin/bsb.ml

@@ -12135,9 +12135,14 @@ let handle_generators oc
     )
 
 
-let make_common_shadows package_specs dirname dir_index 
+let make_common_shadows 
+      is_re
+      package_specs 
+      dirname 
+      dir_index 
   : Bsb_ninja_util.shadow list 
   =
+  let shadows : Bsb_ninja_util.shadow list = 
   { key = Bsb_ninja_global_vars.bs_package_flags;
     op = 
       Append
@@ -12154,8 +12159,14 @@ let make_common_shadows package_specs dirname dir_index
       { key = "bsc_extra_includes";
         op = OverwriteVar (Bsb_dir_index.string_of_bsb_dev_include dir_index)
       }
-     ]
+  ]
   )   
+  in 
+  if is_re then 
+    { key = Bsb_ninja_global_vars.bsc_flags; 
+      op = Append("-bs-re-error")
+    } :: shadows
+  else shadows
 
 
 let emit_impl_build
@@ -12186,7 +12197,7 @@ let emit_impl_build
   let output_js =
     Bsb_package_specs.get_list_of_output_js package_specs output_filename_sans_extension in 
   let common_shadows = 
-    make_common_shadows package_specs
+    make_common_shadows is_re package_specs
       (Filename.dirname file_cmi)
       group_dir_index in
   begin
@@ -12255,7 +12266,7 @@ let emit_intf_build
   in 
   let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in
   let common_shadows = 
-    make_common_shadows package_specs
+    make_common_shadows is_re package_specs
       (Filename.dirname output_cmi)
       group_dir_index in
   Bsb_ninja_util.output_build oc

jscomp/bin/whole_compiler.ml

@@ -112955,7 +112955,12 @@ let leading_space_count str =
   starting from the first erroring character?) *)
 (* Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
-let print_file ~is_warning ~range:((start_line, start_char), (end_line, end_char)) ~lines ppf () =
+let print_file 
+~is_warning 
+~range:((start_line, start_line_start_char), (end_line, end_line_end_char)) 
+~lines
+ppf 
+() =
   (* show 2 lines before & after the erroring lines *)
   let first_shown_line = max 1 (start_line - 2) in
   let last_shown_line = min (Array.length lines) (end_line + 2) in
@@ -113026,13 +113031,13 @@ let print_file ~is_warning ~range:((start_line, start_char), (end_line, end_char
       if current_line_strictly_between_start_and_end_line then
         fprintf ppf "%c@," current_char
       else if i = start_line then begin
-        if j == (start_char - columns_to_cut) then fprintf ppf highlighted_content;
+        if j == (start_line_start_char - columns_to_cut) then fprintf ppf highlighted_content;
         fprintf ppf "%c@," current_char;
-        if j == (end_char - columns_to_cut) then fprintf ppf "@}"
+        if j == current_line_cut_length then fprintf ppf "@}"
       end else if i = end_line then begin
         if j == 1 then fprintf ppf highlighted_content;
         fprintf ppf "%c@," current_char;
-        if j == (end_char - columns_to_cut) then fprintf ppf "@}"
+        if j == (end_line_end_char - columns_to_cut) then fprintf ppf "@}"
       end else
         (* normal, non-highlighted line *)
         fprintf ppf "%c@," current_char
@@ -113977,7 +113982,7 @@ let buckle_script_flags =
    " Better error message combined with other tools "
   )
   :: 
-  ("-bs-print-errors-in-reason-syntax",
+  ("-bs-re-error",
     Arg.Unit Reason_outcome_printer_main.setup,
    " Print compiler errors in Reason syntax"
   )

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -62,9 +62,14 @@ let handle_generators oc
     )
 
 
-let make_common_shadows package_specs dirname dir_index 
+let make_common_shadows 
+      is_re
+      package_specs 
+      dirname 
+      dir_index 
   : Bsb_ninja_util.shadow list 
   =
+  let shadows : Bsb_ninja_util.shadow list = 
   { key = Bsb_ninja_global_vars.bs_package_flags;
     op = 
       Append
@@ -81,8 +86,14 @@ let make_common_shadows package_specs dirname dir_index
       { key = "bsc_extra_includes";
         op = OverwriteVar (Bsb_dir_index.string_of_bsb_dev_include dir_index)
       }
-     ]
+  ]
   )   
+  in 
+  if is_re then 
+    { key = Bsb_ninja_global_vars.bsc_flags; 
+      op = Append("-bs-re-error")
+    } :: shadows
+  else shadows
 
 
 let emit_impl_build
@@ -113,7 +124,7 @@ let emit_impl_build
   let output_js =
     Bsb_package_specs.get_list_of_output_js package_specs output_filename_sans_extension in 
   let common_shadows = 
-    make_common_shadows package_specs
+    make_common_shadows is_re package_specs
       (Filename.dirname file_cmi)
       group_dir_index in
   begin
@@ -182,7 +193,7 @@ let emit_intf_build
   in 
   let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in
   let common_shadows = 
-    make_common_shadows package_specs
+    make_common_shadows is_re package_specs
       (Filename.dirname output_cmi)
       group_dir_index in
   Bsb_ninja_util.output_build oc

jscomp/build_tests/rerror/.gitignore

@@ -0,0 +1,25 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/bs
+*.mlast
+*.mliast
+.vscode
+.merlin

jscomp/build_tests/rerror/README.md

@@ -0,0 +1,18 @@
+# Basic Reason Template
+
+Hello! This project allows you to quickly get started with Reason and BuckleScript. If you wanted a more sophisticated version, try the `react` template (`bsb -theme react -init .`).
+
+# Build
+```
+npm run build
+```
+
+# Build + Watch
+
+```
+npm run watch
+```
+
+
+# Editor
+If you use `vscode`, Press `Windows + Shift + B` it will build automatically

jscomp/build_tests/rerror/bsconfig.json

@@ -0,0 +1,13 @@
+// This is the configuration file used by BuckleScript's build system bsb. Its documentation lives here: http://bucklescript.github.io/bucklescript/docson/#build-schema.json
+// BuckleScript comes with its own parser for bsconfig.json, which is normal JSON, with the extra support of comments and trailing commas.
+{
+  "name": "rerror",
+  "version": "0.1.0",
+  "bsc-flags": ["-bs-super-errors"],
+  "sources": [
+    "src"
+  ],
+  "bs-dependencies" : [
+      // add your dependencies here. You'd usually install them normally through `npm install my-dependency`. If my-dependency has a bsconfig.json too, then everything will work seamlessly.
+  ]
+}

jscomp/build_tests/rerror/input.js

@@ -0,0 +1,8 @@
+var child_process = require('child_process')
+var assert = require('assert')
+var o = child_process.spawnSync(`bsb `,{cwd:__dirname, encoding:'utf8',shell:true})
+
+
+
+var u = o.stdout.match(/int => int/g)
+assert.ok(u.length === 2)

jscomp/build_tests/rerror/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "rerror",
+  "version": "0.1.0",
+  "scripts": {
+    "clean": "bsb -clean-world",
+    "build": "bsb -make-world",
+    "watch": "bsb -make-world -w"
+  },
+  "keywords": [
+    "BuckleScript"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "bs-platform": "1.8.3"
+  }
+}

jscomp/build_tests/rerror/src/demo.re

@@ -0,0 +1,3 @@
+
+
+let x : int => int  = "x";

jscomp/build_tests/rerror/tasks.json

@@ -0,0 +1,38 @@
+{
+    "version": "0.1.0",
+    "command": "npm",
+    "options": {
+        "cwd": "${workspaceRoot}"
+    },
+    "isShellCommand": true,
+    "args": [
+        "run",
+        "watch"
+    ],
+    "showOutput": "always",
+    "isBackground": true,
+    "problemMatcher": {
+        "fileLocation": "absolute",
+        "owner": "ocaml",
+        "watching": {
+            "activeOnStart": false,
+            "beginsPattern": ">>>> Start compiling",
+            "endsPattern": ">>>> Finish compiling"
+        },
+        "pattern": [
+            {
+                "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$",
+                "file": 1,
+                "line": 2,
+                "column": 3,
+                "endColumn": 4
+            },
+            {
+                "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$",
+                "severity": 1,
+                "message": 2,
+                "loop": true
+            }
+        ]
+    }
+}