Skip to content

Commit 9fe85fa

Browse files
imagentlemanJosé Antonio Chio
authored and
José Antonio Chio
committed
Update core.js
1 parent 99cba19 commit 9fe85fa

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

src/core.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ var SPEC_TYPES = /^"(?:number|date(?:time)?|time|month|email|color)\b/i
130130
* Matches the 'import' statement
131131
* @const {RegExp}
132132
*/
133-
var IMPORT_STATEMENT = /^\s*import(?:(\s|\S)*)['|"]/gm
133+
var IMPORT_STATEMENT = /^\s*import(?:(?:\s|[^\s'"])*)['|"].*\n?/gm
134134

135135
/**
136136
* Matches trailing spaces and tabs by line.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import* as foo from 'doe'
2-
import 'bar'
2+
import 'bar'
33
riot.tag2('import-untagged', '<h1>Hello</h1>', '', '', function(opts) {
44
});

test/specs/expect/es6-import.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
import john from 'doe'
2-
import foo from 'bar'
3-
import { foo, bar, baz } from 'foo.bar.baz'
4-
import {
5-
foo,
6-
bar,
7-
baz
8-
} from 'foo.bar.baz'
9-
import {
10-
foo,
11-
bar,
12-
baz } from 'foo.bar.baz'
2+
import foo from 'bar'
3+
import { foo, bar, baz } from 'foo.bar.baz'
4+
import {
5+
foo,
6+
bar,
7+
baz
8+
} from 'foo.bar.baz'
9+
import {
10+
foo,
11+
bar,
12+
baz } from 'foo.bar.baz'
1313

14-
import { foo,
15-
bar,
16-
baz } from 'foo.bar.baz'
14+
import { foo,
15+
bar,
16+
baz } from 'foo.bar.baz'
1717
riot.tag2('import', '<h1>Hello</h1>', '', '', function(opts) {
1818

1919

2020
this.time = function(){
2121
return Date()
2222
}.bind(this)
2323

24-
});
24+
});

test/specs/fixtures/es6-import.tag

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<h1>Hello</h1>
33

44
<script>
5-
import john from 'doe'
6-
import foo from 'bar'
7-
import { foo, bar, baz } from 'foo.bar.baz'
8-
import {
9-
foo,
10-
bar,
11-
baz
12-
} from 'foo.bar.baz'
13-
import {
14-
foo,
15-
bar,
16-
baz } from 'foo.bar.baz'
5+
import john from 'doe'
6+
import foo from 'bar'
7+
import { foo, bar, baz } from 'foo.bar.baz'
8+
import {
9+
foo,
10+
bar,
11+
baz
12+
} from 'foo.bar.baz'
13+
import {
14+
foo,
15+
bar,
16+
baz } from 'foo.bar.baz'
1717

18-
import { foo,
19-
bar,
20-
baz } from 'foo.bar.baz'
18+
import { foo,
19+
bar,
20+
baz } from 'foo.bar.baz'
2121

2222
time(){
2323
return Date()

0 commit comments

Comments
 (0)