Use the platform binary

chenglou · chenglou · commit e90e5907e761 · 2020-08-24T05:29:19.000-07:00
Faster
diff --git a/README.md b/README.md
@@ -45,3 +45,5 @@ Tldr (documented in first link):
 - Change `ReScript.sublime-syntax`
 - Open `syntax_test.res`
 - Command Palette -> Build With: Syntax Tests
+
+For more grammar inspirations, check ST's own [JavaScript grammar](https://github.com/sublimehq/Packages/blob/2c66f1fdea0dbc74aaa3b1c2f904040e9c1aaefa/JavaScript/JavaScript.sublime-syntax).
diff --git a/format.py b/format.py
@@ -5,11 +5,26 @@
 import os
 import tempfile
 import pathlib
+import platform
 
 SETTINGS_PATH = 'Default.sublime-settings'
 
 resExt = ".res"
 resiExt = ".resi"
+platformSystem = platform.system()
+# rescript currently supports 3 platforms: darwin, linux, win32. these also
+# happen to be folder names for the location of the bsc binary. We're in
+# python, so we're gonna translate python's output of system to nodejs'
+# Why don't we just use the binary in node_modules/.bin/bsc? Because that
+# one's a nodejs wrapper, which has a startup cost. It makes it so that every
+# time we call it for e.g. formatting, the result janks a little.
+platformInNodeJS = "linux"
+if platformSystem == "Darwin":
+  platformInNodeJS = "darwin"
+elif platformSystem == "Windows":
+  platformInNodeJS = "win32"
+
+bscPartialPath = os.path.join("node_modules", "bs-platform", platformInNodeJS, "bsc.exe")
 
 def findBsConfigDirFromFilename(filename):
   currentDir = os.path.dirname(filename)
@@ -143,8 +158,7 @@ def findFormatter(view, filename):
     )
     return None
   else:
-    # TODO: find the right platform binary
-    bscExe = os.path.join(bsconfigDir, "node_modules", ".bin", "bsc")
+    bscExe = os.path.join(bsconfigDir, bscPartialPath)
     if os.path.exists(bscExe):
       return bscExe
     else:
@@ -194,7 +208,7 @@ def run(self, edit, formatBuffer=True):
             view.text_point(range_["end"]["line"], range_["end"]["character"]),
           )
           regions.append(region)
-          html = '<body id="my-plugin-feature"> <style> div.error {padding: 5px; } </style> <div class="error">' + message +  '</div> </body>'
+          html = '<body> <style> div.error {padding: 5px; border-radius: 8px;} </style> <div class="error">' + message +  '</div> </body>'
           view.add_phantom("errns", region, html, sublime.LAYOUT_BELOW)
 
       view.add_regions('syntaxerror', regions, 'invalid.illegal', 'dot', sublime.DRAW_NO_FILL)
