Fix jashkenas#1768: Ignore space after ::

GeoffreyBooth · Aug 30, 2017 · f94180f · f94180f
1 parent e54b8a1
commit f94180f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/lib/coffeescript/lexer.js b/lib/coffeescript/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -673,11 +673,12 @@ exports.Lexer = class Lexer
     else if value in UNARY_MATH      then tag = 'UNARY_MATH'
     else if value in SHIFT           then tag = 'SHIFT'
     else if value is '?' and prev?.spaced then tag = 'BIN?'
-    else if prev and not prev.spaced
-      if value is '(' and prev[0] in CALLABLE
+    else if prev
+      if value is '(' and not prev.spaced and prev[0] in CALLABLE
         prev[0] = 'FUNC_EXIST' if prev[0] is '?'
         tag = 'CALL_START'
-      else if value is '[' and prev[0] in INDEXABLE
+      else if value is '[' and ((prev[0] in INDEXABLE and not prev.spaced) or
+         (prev[0] is '::')) # `.prototype` can’t be a method you can call.
         tag = 'INDEX_START'
         switch prev[0]
           when '?'  then prev[0] = 'INDEX_SOAK'

diff --git a/test/formatting.coffee b/test/formatting.coffee
@@ -87,6 +87,9 @@ doesNotThrow -> CoffeeScript.compile """
   a?[b..c]
   """
 
+test "#1768: space between `::` and index is ignored", ->
+  eq 'function', typeof String:: ['toString']
+
 # Array Literals
 
 test "indented array literals don't trigger whitespace rewriting", ->