Skip to content

Commit 59ba873

Browse files
committed
Merge branch 'es6'
2 parents 3340da4 + 6cbc606 commit 59ba873

File tree

12 files changed

+182
-116
lines changed

12 files changed

+182
-116
lines changed

es6.sample.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import exp, {pi, e} from "lib/mathplusplus";
2+
3+
export default class SkinnedMesh extends THREE.Mesh {
4+
constructor(geometry, materials) {
5+
super(geometry, materials);
6+
7+
this.idMatrix = SkinnedMesh.defaultMatrix();
8+
}
9+
update(camera) {
10+
//...
11+
super.update();
12+
}
13+
static defaultMatrix() {
14+
return new THREE.Matrix4();
15+
}
16+
}
17+
18+
nums.forEach(v => {
19+
if (v % 5 === 0)
20+
fives.push(v);
21+
});
22+

ftdetect/es6.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
" set all `es6` extensions to javascript
2+
au BufRead,BufNewFile *.{es6,es6.js} filetype=javascript

sample.gif

1.7 MB
Loading

syntax/javascript.vim

Lines changed: 21 additions & 116 deletions
Large diffs are not rendered by default.

syntax/modules/es6-promise.vim

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
syntax keyword javascriptGlobal Promise nextgroup=javascriptGlobalPromiseDot,javascriptFuncCallArg
2+
syntax match javascriptGlobalPromiseDot /\./ contained nextgroup=javascriptPromiseStaticMethod
3+
syntax keyword javascriptPromiseStaticMethod contained resolve reject all race nextgroup=javascriptFuncCallArg
4+
if exists("did_javascript_hilink") | HiLink javascriptPromiseStaticMethod Keyword
5+
endif
6+
syntax keyword javascriptPromiseMethod contained then catch nextgroup=javascriptFuncCallArg
7+
syntax cluster props add=javascriptPromiseMethod
8+
if exists("did_javascript_hilink") | HiLink javascriptPromiseMethod Keyword
9+
endif

syntax/modules/es6-proxy.vim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
syntax keyword javascriptGlobal Proxy
2+
syntax keyword javascriptProxyAPI contained getOwnPropertyDescriptor getOwnPropertyNames
3+
syntax keyword javascriptProxyAPI contained defineProperty deleteProperty freeze seal
4+
syntax keyword javascriptProxyAPI contained preventExtensions has hasOwn get set enumerate
5+
syntax keyword javascriptProxyAPI contained iterate ownKeys apply construct
6+
if exists("did_javascript_hilink") | HiLink javascriptProxyAPI Keyword
7+
endif

syntax/modules/es6-regexp.vim

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
syntax keyword javascriptGlobal RegExp nextgroup=javascriptGlobalRegExpDot,javascriptFuncCallArg
2+
syntax match javascriptGlobalRegExpDot /\./ contained nextgroup=javascriptRegExpStaticProp
3+
syntax keyword javascriptRegExpStaticProp contained lastIndex
4+
if exists("did_javascript_hilink") | HiLink javascriptRegExpStaticProp Keyword
5+
endif
6+
syntax keyword javascriptRegExpProp contained global ignoreCase multiline source sticky
7+
syntax cluster props add=javascriptRegExpProp
8+
if exists("did_javascript_hilink") | HiLink javascriptRegExpProp Keyword
9+
endif
10+
syntax keyword javascriptRegExpMethod contained exec test nextgroup=javascriptFuncCallArg
11+
syntax cluster props add=javascriptRegExpMethod
12+
if exists("did_javascript_hilink") | HiLink javascriptRegExpMethod Keyword
13+
endif

syntax/modules/es6-set.vim

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
syntax keyword javascriptGlobal Set WeakSet
2+
syntax keyword javascriptES6SetProp contained size
3+
syntax cluster props add=javascriptES6SetProp
4+
if exists("did_javascript_hilink") | HiLink javascriptES6SetProp Keyword
5+
endif
6+
syntax keyword javascriptES6SetMethod contained add clear delete entries forEach has nextgroup=javascriptFuncCallArg
7+
syntax keyword javascriptES6SetMethod contained values nextgroup=javascriptFuncCallArg
8+
syntax cluster props add=javascriptES6SetMethod
9+
if exists("did_javascript_hilink") | HiLink javascriptES6SetMethod Keyword
10+
endif

syntax/modules/es6-string.vim

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
syntax keyword javascriptGlobal String nextgroup=javascriptGlobalStringDot,javascriptFuncCallArg
2+
syntax match javascriptGlobalStringDot /\./ contained nextgroup=javascriptStringStaticMethod
3+
syntax keyword javascriptStringStaticMethod contained fromCharCode fromCodePoint nextgroup=javascriptFuncCallArg
4+
if exists("did_javascript_hilink") | HiLink javascriptStringStaticMethod Keyword
5+
endif
6+
syntax keyword javascriptStringMethod contained anchor charAt charCodeAt codePointAt nextgroup=javascriptFuncCallArg
7+
syntax keyword javascriptStringMethod contained concat endsWith includes indexOf lastIndexOf nextgroup=javascriptFuncCallArg
8+
syntax keyword javascriptStringMethod contained link localeCompare match normalize nextgroup=javascriptFuncCallArg
9+
syntax keyword javascriptStringMethod contained repeat replace search slice split nextgroup=javascriptFuncCallArg
10+
syntax keyword javascriptStringMethod contained startsWith substr substring toLocaleLowerCase nextgroup=javascriptFuncCallArg
11+
syntax keyword javascriptStringMethod contained toLocaleUpperCase toLowerCase toString nextgroup=javascriptFuncCallArg
12+
syntax keyword javascriptStringMethod contained toUpperCase trim valueOf nextgroup=javascriptFuncCallArg
13+
syntax cluster props add=javascriptStringMethod
14+
if exists("did_javascript_hilink") | HiLink javascriptStringMethod Keyword
15+
endif

syntax/modules/es6-symbol.vim

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
syntax keyword javascriptGlobal Symbol nextgroup=javascriptGlobalSymbolDot,javascriptFuncCallArg
2+
syntax match javascriptGlobalSymbolDot /\./ contained nextgroup=javascriptSymbolStaticProp,javascriptSymbolStaticMethod
3+
syntax keyword javascriptSymbolStaticProp contained create hasInstance isConcatSpreadable
4+
syntax keyword javascriptSymbolStaticProp contained isRegExp iterator toPrimitive
5+
syntax keyword javascriptSymbolStaticProp contained toStringTag unscopables
6+
if exists("did_javascript_hilink") | HiLink javascriptSymbolStaticProp Keyword
7+
endif
8+
syntax keyword javascriptSymbolStaticMethod contained for keyFor nextgroup=javascriptFuncCallArg
9+
if exists("did_javascript_hilink") | HiLink javascriptSymbolStaticMethod Keyword
10+
endif

0 commit comments

Comments
 (0)