Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FJSX15] Expression and statement prediction enhancement; Scope normalization; Candyman support #28

Merged
merged 409 commits into from
Jan 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
409 commits
Select commit Hold shift + click to select a range
67b12e7
[FJSX15] Add the "of" operator
borela Dec 12, 2017
2936bcc
[FJSX15] Function declaration meta scope
borela Dec 12, 2017
2405215
[FJSX15] Make arrow function consistent
borela Dec 12, 2017
4252258
[FJSX15] Restore JSX
borela Dec 12, 2017
c0de8cb
[FJSX15] Add JSX fragments
borela Dec 12, 2017
cde481e
[FJXS15] Add await operator
borela Dec 12, 2017
f612192
[FJSX15] Add rest operator
borela Dec 13, 2017
b2a500e
[FJSX15] Normalize terminator scope
borela Dec 13, 2017
5df6290
[FJSX15] Simplify optional modifier
borela Dec 13, 2017
5f19e88
[FJSX15] Fix object destructuring
borela Dec 13, 2017
5542b1a
[FJSX15] Fix expression group scope
borela Dec 13, 2017
fdf10a1
[FJSX15] Fix super not being highlighted as support
borela Dec 13, 2017
6109a1a
[FJSX15] Fix fragment content
borela Dec 13, 2017
97b52bb
[FJSX15] Remove unnecessary capturing group
borela Dec 13, 2017
cb1a138
[FJSX15] Add rest to arrow parameters
borela Dec 13, 2017
6aa176e
[FJSX15] Add meta scope test
borela Dec 13, 2017
c1257ac
Add variable function calls to candyman
borela Dec 14, 2017
772f876
[FJSX15] Fix parameter destructuring with type
borela Dec 14, 2017
f339e14
[FJSX15] Restrict function call context scope
borela Dec 14, 2017
d72f3a6
Add terminator to arrow tests
borela Dec 14, 2017
a54259b
[FJSX15] Fix property access scope
borela Dec 14, 2017
d14ffb4
[FJSX15] Resolve spread operator ambiguity
borela Dec 15, 2017
4a1a13a
[FJSX15] Fix simple arrow function expression body
borela Dec 16, 2017
fa75148
[FJSX15] Rename variable for consistency
borela Dec 16, 2017
9b5e8e5
[FJSX15] Compact code
borela Dec 16, 2017
c6a1c6d
[FJSX15] Add required quotes
borela Dec 16, 2017
7d7d3b1
[FJSX15] Restore object literal
borela Dec 16, 2017
e92223f
[FJSX15] Restore class body
borela Dec 16, 2017
dc2dec1
[FJSX15] Remove dead code
borela Dec 16, 2017
f2fdcff
[FJSX15] Restore indexer
borela Dec 16, 2017
d48ad73
[FJSX15] Simplify object literal
borela Dec 16, 2017
e1cd2f9
[FJSX15] Restore decorators
borela Dec 16, 2017
a397dd6
[FJSX15] Add modifier trap
borela Dec 16, 2017
7f393a8
[FJSX15] Simplify class properties
borela Dec 16, 2017
e342156
[FJSX15] Simplify expressions
borela Dec 16, 2017
3b141a4
[FJXS15] Restore import export
borela Dec 16, 2017
7ecbcfd
[FJSX15] Rename context for consistency
borela Dec 16, 2017
844613f
[FJSX15] Simplify pipe
borela Dec 16, 2017
4ab6b16
[FJSX15] Restore react class properties
borela Dec 16, 2017
4cdd70d
[FJSX15] Fix methods optional body
borela Dec 16, 2017
a08f2e8
[FJSX15] Add declare statement
borela Dec 16, 2017
84751d4
[FJSX15] Remove dead code
borela Dec 16, 2017
fc0eaf7
[FJSX15] Fix CommonJS module declaration
borela Dec 16, 2017
cdc7ee9
[FJSX15] Restore flow functions
borela Dec 16, 2017
7753d3d
[FJSX15] Allow properties to be marked as optional
borela Dec 16, 2017
9209243
[FJSX15] Make type aliasing expressions optional
borela Dec 16, 2017
2920282
[FJSX15] Add covariant and contravariant operators
borela Dec 16, 2017
85ed94d
[FJSX15] Restore interface
borela Dec 16, 2017
ff370ae
[FJSX15] Fix group scope
borela Dec 16, 2017
51e5db3
[FJSX15] Highlight methods in flow objects
borela Dec 16, 2017
1482e8c
[FJSX15] Restore flow block comments
borela Dec 16, 2017
6f33697
[FJSX15] Make function body optional
borela Dec 16, 2017
75f333a
[FJSX15] Remove dead code
borela Dec 16, 2017
f04b06d
[FJSX15] Break typeof and void operators apart
borela Dec 16, 2017
4d00bdd
[FJSX15] Add existential type
borela Dec 16, 2017
04ca276
[FJSX15] Fix arrow function multi statement body
borela Dec 17, 2017
6c5d86d
[FJSX15] Fix method without identifier detection
borela Dec 17, 2017
0b47b3e
[FJSX15] Fix arrow function body end
borela Dec 17, 2017
6ee08e0
[FJSX15] Fix scopes according to sublime core
borela Dec 17, 2017
bc1eaf2
[FJSX15] Make functions assigned to variable overpower constant
borela Dec 17, 2017
b32f658
[FJSX15] Enhance object access prediction
borela Dec 17, 2017
d9a5086
[FJSX15] Enhance function call on pipeline operator
borela Dec 17, 2017
1748445
[FJSX15] Simplify and normalize string literal scopes
borela Dec 17, 2017
391730b
[FJSX15] Fix and clean operators
borela Dec 17, 2017
059ff61
[FJSX15] Restore switch statements
borela Dec 17, 2017
482f0d5
[FJSX15] Fix JSX scopes
borela Dec 17, 2017
9668fef
[FJSX15] Remove dead code
borela Dec 18, 2017
d1237a5
[FJSX15] Normal support object scopes
borela Dec 18, 2017
f543c59
[FJSX15] Normalize decorator scopes
borela Dec 18, 2017
e141568
[FJSX15] Normal globals' scopes
borela Dec 18, 2017
ccdfef0
[FJSX15] Fix comma scope
borela Dec 18, 2017
3a29856
[FJSX15] Fix ASI bug on return and throw
borela Dec 18, 2017
7236910
[FJSX15] Fix support function body contents
borela Dec 18, 2017
67486cd
[FJSX15] Fix typo in ASI checked expressions
borela Dec 18, 2017
bea131f
[FJSX15] Normalize operator scopes
borela Dec 18, 2017
4053824
[FJSX15] Fix typos
borela Dec 18, 2017
e6e2dae
[FJSX15] Tone down for statements
borela Dec 18, 2017
17af7ab
[FJSX15] Fix fragment scope
borela Dec 18, 2017
93e03c1
[FJSX15] Clean up arrow scopes
borela Dec 18, 2017
6afc85e
[FJSX15] Add new.target and normalize scope
borela Dec 18, 2017
a506497
[FJSX15] Remove ... from decorator scopes
borela Dec 18, 2017
32245b2
[FJSX15] Normalize numeric scopes
borela Dec 18, 2017
fbf6fc7
[FJSX15] Normalize array literal scope
borela Dec 18, 2017
b65ea27
[FJSX15] Normalize property scope
borela Dec 18, 2017
8e0ac29
[FJSX15] Envelop variable declaration into a meta scope
borela Dec 18, 2017
ae7c99b
[FJSX15] Normalize class meta scopes
borela Dec 19, 2017
58c4397
[FJSX15] Normalize block scopes
borela Dec 19, 2017
9289cb6
[FJSX15] Expand function.declaration in assigned variables
borela Dec 19, 2017
a2cc2a8
[FjSX15] Add meta group
borela Dec 19, 2017
f01c314
[FjSX15] Fix chained decorators
borela Dec 19, 2017
403e178
[FjSX15] Normalize arrow function meta scopes
borela Dec 19, 2017
9cd968d
[FjSX15] Fix typo in interfaces
borela Dec 19, 2017
d942e83
[FjSX15] Add new.target and normalize scopes
borela Dec 19, 2017
f062f74
[FjSX15] Normalize generator modifier
borela Dec 19, 2017
7634611
[FjSX15] Normalize array literal scopes
borela Dec 19, 2017
6080f0b
[FjSX15] Normalize numeric scopes
borela Dec 19, 2017
e2e0f62
[FjSX15] Normalize object literal scopes
borela Dec 19, 2017
7c1777a
[FjSX15] Normalize function body scopes
borela Dec 19, 2017
d2831c5
[FJSX15] Resolve conflicts
borela Dec 19, 2017
fbe58fe
[FJSX15] Add method meta scope
borela Dec 19, 2017
2f78b62
[FJSX15] Remove support parameter, body and arguments
borela Dec 19, 2017
116cdc4
[FJSX15] Normalize parameters scope
borela Dec 19, 2017
c5d6e8e
[FJSX15] Normalize constructor scope
borela Dec 19, 2017
34f7af9
[FJSX15] Expand method meta scope
borela Dec 19, 2017
f80e5d5
[FJSX15] Fix operators order
borela Dec 23, 2017
ca73961
[FJSX15] Normalize function meta scopes
borela Dec 23, 2017
59d1c88
[FJSX15] Simplify arrow functions and normalize their scopes
borela Dec 23, 2017
19fedb1
[FJSX15] Simplify and normalize method scopes
borela Dec 23, 2017
c61ff08
[FJSX15] Expose expression escape pattern
borela Dec 23, 2017
1e52741
[FJSX15] Simplify function call and normalize scopes
borela Dec 23, 2017
5cb4af0
[FJSX15] Simplify and normalize decorators
borela Dec 23, 2017
cfdadbc
[FJSX15] Fix reference to paramters
borela Dec 23, 2017
58cf214
[FJSX15] Use the core regex
borela Dec 23, 2017
6fe37eb
[FJSX15] Normalize flow types
borela Dec 23, 2017
5c21a1f
[FJSX15] Normalize new and typeof operators
borela Dec 23, 2017
949e633
[FJSX15] Fix decorator duplicated scope
borela Dec 24, 2017
8e8d396
[FJSX15] Fix function call duplicated scope
borela Dec 24, 2017
7628d6c
[FJSX15] Add meta scope to pipe functions
borela Dec 24, 2017
79b2530
[FJSX15] Add meta scope to function parameters
borela Dec 24, 2017
fb98e4f
[FJSX15] Change parameter comma scope
borela Dec 24, 2017
c7eb271
[FJSX15] Enhance optional paramter prediction
borela Dec 24, 2017
88369b3
[FJSX15] Expand optional parameter meta scope
borela Dec 24, 2017
f9158e2
[FJSX15] Fix object literal key meta scope
borela Dec 24, 2017
02c63a3
[FJSX15] Normalize jest scopes
borela Dec 25, 2017
a67ba75
[FJSX15] Extract flow to its own directory
borela Dec 25, 2017
c29fba9
[FJSX15] Add version suffix to flow syntax
borela Dec 25, 2017
143cd35
[FJSX15] Add computed key meta scope
borela Dec 25, 2017
4a27edf
[FJSX15] Normalize JSX scopes
borela Dec 25, 2017
bdc74ad
[FJSX15] Fix JSX closing tag
borela Dec 25, 2017
71be973
[FJSX15] Add attribute with value meta scope
borela Dec 25, 2017
a0b99c7
[FJSX15] Expand JSX meta scopes
borela Dec 25, 2017
abaea0f
[FJSX15] Add import.meta
borela Dec 26, 2017
f495921
[FJSX15] Add HTML suffix to enhance color scheme compatibility
borela Dec 26, 2017
0e42c5f
[FJSX15] Fix flow references
borela Dec 26, 2017
5180870
[FJSX15] Add HTML suffix to jsx strings
borela Dec 26, 2017
c32b0c8
[FJSX15] Move flow comment file
borela Dec 26, 2017
4ef7c52
[FJSX15] Make JSX similar to HTML
borela Dec 26, 2017
e73e5b5
[FJSX15] Cleanup embedded JS scopes
borela Dec 26, 2017
52a2774
[FJSX15] Fix arrow function parameters
borela Dec 26, 2017
772f03f
[FJSX15] Enhance arrow function with strings prediction
borela Dec 26, 2017
1725652
[FJSX15] Enhance string pattern
borela Dec 26, 2017
51acbae
[FJSX15] Enhance parameters prediction
borela Dec 26, 2017
0d9ad70
[FJSX15] Fix typeof expressions in call arguments
borela Dec 27, 2017
ff96342
[FJSX15] Simplify tag content highlighting
borela Dec 27, 2017
6dfbb91
[FJSX15] Remove unnecessary JSX macro
borela Dec 27, 2017
0b516f8
[FJSX15] Normalize class and style scopes
borela Dec 27, 2017
a512242
[FJSX15] Cleanup JSX content scopes
borela Dec 27, 2017
00357f6
[FJSX15] Fix indexer priority
borela Dec 28, 2017
46c0598
[FJSX15] Normalize blocks and conditionals
borela Dec 28, 2017
9881249
[FJSX15] Normalize decorator meta scope
borela Dec 28, 2017
0c4f490
[FJSX15] Normalize section group scope
borela Dec 28, 2017
1bf4263
[FJSX15] Tone down method greediness
borela Dec 28, 2017
486942c
[FJSX15] Normalize new.target scope
borela Dec 28, 2017
f208dda
Merge branch 'feature/upgrade-candyman' into hotfix/fjsx15-bugs
borela Dec 28, 2017
157f006
[FJSX15] Stop modifiers near colon
borela Dec 29, 2017
75b5b42
[FJSX15] Cleanup statements meta scopes
borela Dec 29, 2017
c1655fa
[FJSX15] Add indexer to flow objects
borela Dec 29, 2017
ec70eaf
[FJSX15] Change indexer priority in classes
borela Dec 29, 2017
dfd6bee
[FJSX15] Fix generic refinement
borela Dec 30, 2017
dc161ed
[FLOW] Add typeof
borela Dec 30, 2017
c6b9d0a
Update generic and terminator color
borela Dec 30, 2017
1efda60
Add class declaration color
borela Dec 31, 2017
d88ad5a
Clean up function colors
borela Dec 31, 2017
71f448b
Add comment, json and string colors
borela Dec 31, 2017
8d7adb4
Update candyman build
borela Dec 31, 2017
7198aa3
[FJSX15] Add meta block scope to class and function body
borela Dec 31, 2017
8382d77
[FJSX15] Specialize class modifier
borela Dec 31, 2017
5397b03
[FJSX15] Add missing meta scopes
borela Jan 1, 2018
3946cd7
[FJSX15] Normalize flow statements scopes
borela Jan 1, 2018
3ac75dc
[FJSX15] Simplify jest globals
borela Jan 1, 2018
03200a4
[FJSX15] Fix function call meta scopes in expressions
borela Jan 1, 2018
e27befa
[FJSX15] Rename operator
borela Jan 1, 2018
571bd50
[FLOW] Change existential scope
borela Jan 1, 2018
8f75fbf
Add helper function
borela Jan 1, 2018
08c2199
Add globals color
borela Jan 1, 2018
95a6d77
Add rules for function parameters and punctuation
borela Jan 1, 2018
ca5b63d
Add rules for class body
borela Jan 1, 2018
a31f117
Add rules for function call
borela Jan 1, 2018
2554627
Link function body new rules
borela Jan 1, 2018
4200170
Add rule for regexp
borela Jan 1, 2018
b24a5da
Cleanup
borela Jan 1, 2018
6446e8f
Change annotations color
borela Jan 1, 2018
5cd3d3e
Add array rules
borela Jan 1, 2018
b0f57a8
Add keyword rules
borela Jan 1, 2018
952037c
[FJSX15] Fix array literal scopes typo
borela Jan 1, 2018
9aeca8d
Make comments darker
borela Jan 1, 2018
196caef
[FJSX15] FIx object literal meta scope
borela Jan 1, 2018
96199c5
[FJSX15] Normalize object literal key
borela Jan 1, 2018
95f1480
[FJSX15] Normalize import origin scope
borela Jan 1, 2018
533b0b6
[FJSX15] Normalize await scope
borela Jan 1, 2018
83a6552
[FJSX15] Fix new scope typo
borela Jan 1, 2018
a0f6e85
Add missing keyword colors
borela Jan 2, 2018
ec42da8
Make conditionals brown
borela Jan 2, 2018
8ba5bce
Remove dead code
borela Jan 2, 2018
7ced644
Disable punctuation color but let the code for reference
borela Jan 2, 2018
96dde8a
Update template expresssion color
borela Jan 2, 2018
d907e57
Update comma operator color
borela Jan 2, 2018
c47dbe1
Change global console object color
borela Jan 2, 2018
75ab631
Fix modifier rules and style
borela Jan 2, 2018
2f2b976
Add the root color settings
borela Jan 2, 2018
235192e
Add the object literal key color
borela Jan 2, 2018
01be59f
Add specific constants color
borela Jan 2, 2018
6bcba34
[FJSX15] Simplify statements
borela Jan 2, 2018
65351cb
[FJSX15] Disable many core globals temporarily but leave console
borela Jan 2, 2018
f24e596
Make function declarations pop
borela Jan 2, 2018
a4d2ab2
[FJSX15] Normalize operator scopes
borela Jan 3, 2018
d2a2c3b
[FJSX15] Normalize function meta scopes
borela Jan 3, 2018
1100fa9
[FJSX15] Normalize await scopes
borela Jan 3, 2018
55b47fb
[FJSX15] Fix for statement header
borela Jan 3, 2018
54ce797
Balance colors and simplify
borela Jan 3, 2018
e52282e
Make operators bold
borela Jan 3, 2018
ba6491a
[FJSX15] Add core functions again
borela Jan 3, 2018
abab79a
[FJSX15] Normalize scopes
borela Jan 3, 2018
4d51eaf
Add markup colors
borela Jan 3, 2018
e0e234f
Add label rules
borela Jan 3, 2018
0b8b6bb
Balance color and token weights
borela Jan 3, 2018
a1423be
Remove dead code
borela Jan 3, 2018
ba2ef8d
Build candyman
borela Jan 3, 2018
6a894d5
[FJSX15] Normalize destructuring scopes
borela Jan 4, 2018
f864199
[FJSX15] Fix object literal scopes
borela Jan 4, 2018
473eff6
Rebalance return, throw and object keys
borela Jan 4, 2018
f02ff93
[FJSX15] Remove dead code
borela Jan 4, 2018
67b8391
[FJSX15] Add specific scope to destructuring key
borela Jan 4, 2018
318751d
Rebalance theme weights and colors
borela Jan 4, 2018
39450aa
[FJSX15] Fix variable declaration scopes in destructuring
borela Jan 4, 2018
60f05fb
[FJSX15] Fix destructuring comma scope
borela Jan 4, 2018
c568849
[FJSX15] Normalize import scopes
borela Jan 4, 2018
94b1076
Rebalance candyman colors
borela Jan 4, 2018
920f6bb
[FLOW] Normalize scopes
borela Jan 4, 2018
3fb45b9
[FJSX15] Normalize scope chain
borela Jan 4, 2018
66515c9
[FLOW] Normalize scopes
borela Jan 4, 2018
25b4bb7
Change namespace and extends colors
borela Jan 4, 2018
e0946e7
[FJSX15] Remove dead code
borela Jan 4, 2018
4acbedf
[FJSX15] Add function.sent and import.meta
borela Jan 4, 2018
da7c827
Change numbers color
borela Jan 4, 2018
fb3ba63
[FJSX15] Simplify function calls
borela Jan 4, 2018
e017515
[FJSX15] Simplify imports
borela Jan 4, 2018
7446972
[FJSX15] Simplify new operator
borela Jan 4, 2018
914c235
[FJSX15] Restore type import
borela Jan 4, 2018
df9e79a
[FLOW] Fix generics scopes
borela Jan 4, 2018
136ab91
[FLOW] Fix type aliasing scopes
borela Jan 4, 2018
da1eb66
Add generic color
borela Jan 4, 2018
b1bb662
[FLOW] Fix array shorthand
borela Jan 5, 2018
ef54721
[FLOW] Rename template to generic
borela Jan 5, 2018
e7ceaf1
[FJSX15] Rename template to generic
borela Jan 5, 2018
3e44a66
[FLOW] Fix generic parameters in flow functions
borela Jan 5, 2018
8b2a78c
[FJSX15] Expand import scopes
borela Jan 5, 2018
3ab065a
[FJSX15] Simplify exports and normalize scopes
borela Jan 5, 2018
51d28ea
[FJSX15] Add typeof to flow imports
borela Jan 5, 2018
3e3a35d
Rebalance candyman colors
borela Jan 5, 2018
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
20 changes: 20 additions & 0 deletions Candyman.scsscheme
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,36 @@

@name 'Candyman';
@import 'schemes/candyman/palette';
@import 'schemes/candyman/repeatString';
@import 'schemes/candyman/main';

// Old scopes.
@import 'schemes/candyman/old';

// New scopes.
@import 'schemes/candyman/annotation';
@import 'schemes/candyman/array';
@import 'schemes/candyman/class';
@import 'schemes/candyman/class/body';
@import 'schemes/candyman/comment';
@import 'schemes/candyman/constant';
@import 'schemes/candyman/destructuring';
@import 'schemes/candyman/function';
@import 'schemes/candyman/function-call';
@import 'schemes/candyman/function/body';
@import 'schemes/candyman/function/parameters';
@import 'schemes/candyman/generic';
@import 'schemes/candyman/global/console';
@import 'schemes/candyman/global/jest';
@import 'schemes/candyman/json';
@import 'schemes/candyman/keyword';
@import 'schemes/candyman/label';
@import 'schemes/candyman/markup';
@import 'schemes/candyman/modifier';
@import 'schemes/candyman/namespace';
@import 'schemes/candyman/number';
@import 'schemes/candyman/object';
@import 'schemes/candyman/punctuation';
@import 'schemes/candyman/string';
@import 'schemes/candyman/type';
@import 'schemes/candyman/variable';
Loading