Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/atom-react.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class AtomReact

isReact: (text) ->
if not contentCheckRegex?
match = (atom.config.get('react.detectReactFilePattern') || '/require\\([\'"]react[\'"]\\)/').match(new RegExp('^/(.*?)/([gimy]*)$'));
match = (atom.config.get('react.detectReactFilePattern') || '/require\\([\'"]react(?:-native)?[\'"]\\)/').match(new RegExp('^/(.*?)/([gimy]*)$'));
contentCheckRegex = new RegExp(match[1], match[2])
return text.match(contentCheckRegex)?

Expand All @@ -105,7 +105,7 @@ class AtomReact

path = require 'path'

# Check if file extension is .jsx or the file has require React
# Check if file extension is .jsx or the file requires React
extName = path.extname(editor.getPath())
if extName is ".jsx" or (extName is ".js" and @isReact(editor.getText()))
jsxGrammar = atom.grammars.grammarsByScopeName["source.js.jsx"]
Expand Down
7 changes: 7 additions & 0 deletions spec/atom-react-spec.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
describe "React tests", ->
sampleCorrectFile = require.resolve './fixtures/sample-correct.js'
sampleCorrectNativeFile = require.resolve './fixtures/sample-correct-native.js'
sampleInvalidFile = require.resolve './fixtures/sample-invalid.js'

beforeEach ->
Expand All @@ -20,6 +21,12 @@ describe "React tests", ->
expect(editor.getGrammar().scopeName).toEqual 'source.js.jsx'
editor.destroy()

it "should select source.js.jsx if file has require('react-native')", ->
waitsForPromise ->
atom.workspace.open(sampleCorrectNativeFile, autoIndent: false).then (editor) ->
expect(editor.getGrammar().scopeName).toEqual 'source.js.jsx'
editor.destroy()

it "should select source.js if file doesnt have require('react')", ->
waitsForPromise ->
atom.workspace.open(sampleInvalidFile, autoIndent: false).then (editor) ->
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/sample-correct-native.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var React = require('react-native');