File with lightscript directive is always flagged as lightscript

wcjohnson · Jul 6, 2017 · 610e80b · 610e80b
1 parent 69913bd
commit 610e80b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/compilerState.lsc b/src/compilerState.lsc
@@ -44,7 +44,7 @@ export getBabel() -> compilerState.babel
 export getOptions() -> compilerState.opts
 
 export getFileTypeInfo(file) ->
-  if not file?.opts?.filename: return { isLightScript: true, isLSX: false}
+  if not file?.opts?.filename: return { isLightScript: true, isLSX: false }
   filename = file.opts.filename
 
   if filename.includes(".lsx"): return { isLightScript: true, isLSX: true }
@@ -75,6 +75,8 @@ findFirstTokenLoc(tokens) ->
 export createCompilerState(initialState) ->
   now compilerState = initialState
   processFilename(compilerState)
+  // Allow config directives to override filename processing
+  if initialState.file?.isLightScript: compilerState.isLightScript = true
 
   // Get zero-location
   tokens = initialState?.file?.ast?.tokens

diff --git a/src/index.lsc b/src/index.lsc
@@ -282,8 +282,8 @@ Lightscript(babel) ->
     // Don't read as LSC
     if (not fileTypeInfo.isLightScript) and (not cdOpts.isLightScript): return
 
+    file.isLightScript = true
     Object.assign(pluginOpts, cdOpts)
-    console.dir(pluginOpts)
 
     // Get LSC parser opts
     opts.parserOpts = opts.parserOpts or {}