Skip to content

Commit 453bd5f

Browse files
mathiasbynensmikesamuel
authored andcommitted
Add from as a JavaScript keyword (googlearchive#539)
E.g. import { foo, bar } from './lib.mjs';
1 parent fbd527e commit 453bd5f

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

distrib/prettify-small.zip

15 Bytes
Binary file not shown.

js-modules/prettify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var prettyPrint;
148148
"for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
149149
"throw,true,try,unless,until,when,while,yes";
150150
var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
151-
"abstract,async,await,constructor,debugger,enum,eval,export,function," +
151+
"abstract,async,await,constructor,debugger,enum,eval,export,from,function," +
152152
"get,import,implements,instanceof,interface,let,null,of,set,undefined," +
153153
"var,with,yield,Infinity,NaN"];
154154
var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +

loader/lang-swift.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

loader/prettify.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

loader/run_prettify.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node_prettify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var prettyPrint;
148148
"for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
149149
"throw,true,try,unless,until,when,while,yes";
150150
var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
151-
"abstract,async,await,constructor,debugger,enum,eval,export,function," +
151+
"abstract,async,await,constructor,debugger,enum,eval,export,from,function," +
152152
"get,import,implements,instanceof,interface,let,null,of,set,undefined," +
153153
"var,with,yield,Infinity,NaN"];
154154
var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +

src/prettify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ var prettyPrint;
196196
"for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
197197
"throw,true,try,unless,until,when,while,yes";
198198
var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
199-
"abstract,async,await,constructor,debugger,enum,eval,export,function," +
199+
"abstract,async,await,constructor,debugger,enum,eval,export,from,function," +
200200
"get,import,implements,instanceof,interface,let,null,of,set,undefined," +
201201
"var,with,yield,Infinity,NaN"];
202202
var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +

src/run_prettify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ var IN_GLOBAL_SCOPE = false;
425425
"for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
426426
"throw,true,try,unless,until,when,while,yes";
427427
var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
428-
"abstract,async,await,constructor,debugger,enum,eval,export,function," +
428+
"abstract,async,await,constructor,debugger,enum,eval,export,from,function," +
429429
"get,import,implements,instanceof,interface,let,null,of,set,undefined," +
430430
"var,with,yield,Infinity,NaN"];
431431
var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +

0 commit comments

Comments
 (0)