183 Commits

Author SHA1 Message Date
John Sundell
45740696d0 Correctly highlight Bools passed as unnamed function arguments
This patch fixes highlighting of `Bool` values passed as arguments that
don’t have an external parameter label.
2019-03-08 18:32:12 +01:00
John Sundell
48449ae5b1
Merge pull request #37 from JohnSundell/multiple-protocols
Correctly highlight types conforming to multiple protocols
2019-03-08 18:24:41 +01:00
John Sundell
7f2421cd99 Correctly highlight types conforming to multiple protocols
Previously, the last protocol would be treated as a function call (Splash
thought it was a call with trailing closure syntax, rather than the opening
of a type definition). This patch fixes that by verifying that the code
checking for constraints inside a generic type definition is in fact looking
at a generic, rather than something else.
2019-03-08 18:20:36 +01:00
John Sundell
b6232fc67f
Merge pull request #36 from JohnSundell/keywords-as-function-names
Don’t treat keywords used as function names as keywords
2019-03-08 18:05:20 +01:00
John Sundell
ddd2bf9020 Don’t treat keywords used as function names as keywords
Swift enables the use of keywords as function names, and we want those
to be treated as plain text (like other function names) rather than as
keywords. Some keywords require escaping using back-ticks, and this
patch accounts for both of those variations.
2019-03-08 17:55:44 +01:00
John Sundell
50a4c6a15e
Merge pull request #35 from JohnSundell/init-dot-syntax
Don’t treat .init() as an enum
2019-03-08 17:40:31 +01:00
John Sundell
87437d7425 Don’t treat .init() as an enum
This change adds a special condition not to treat `.init()` as an enum
(or any other kind of dot access), just like we previously had for `self`.
2019-03-08 17:26:10 +01:00
John Sundell
b72ba08cfc
README: Declare Swift version as 4.2 2019-03-06 11:08:32 +01:00
John Sundell
e6aa6129e0
Merge pull request #34 from JohnSundell/Swift-4.2
Bump Swift version to 4.2
2019-03-06 11:07:48 +01:00
John Sundell
f7732d1b23 Bump Swift version to 4.2 2019-03-06 10:44:59 +01:00
John Sundell
a3f7fb43c2
Merge pull request #33 from JohnSundell/indirect-enums
Add support for indirect enums
2019-03-06 10:42:30 +01:00
John Sundell
5d075f7168 Add support for indirect enums
This patch makes Splash correctly highlight `indirect` enums. The keyword
was missing from the grammar definition.
2019-03-06 10:40:03 +01:00
John Sundell
79ce0efd0e
Merge pull request #28 from kelvinlauKL/master
Fixes a typo
2019-01-16 23:56:58 +00:00
Kelvin Lau
4a42e6c582 Fixes typo 2019-01-15 17:41:19 -08:00
John Sundell
787d3ed127
Merge pull request #27 from ldstreet/patch-1
Update readme to include final html example
2019-01-14 00:23:05 +00:00
Luke Street
7186bd6548
Spaces not tabs
updated to use spaces instead of tabs to be consistent
2019-01-12 01:14:36 -06:00
Luke Street
f1796eb99b
Update readme to include final html example
Adding an example of a finished html file for those that might be less experienced in html (such as myself). Also added link to  HTMLOutputFormat and SPM declaration snippet for convenience. Thanks for the great library!
2019-01-07 22:39:47 -06:00
John Sundell
41f04573a4
Merge pull request #26 from mannberg/mannberg/splashtag
Added splashtag info to README
2018-12-17 00:46:20 +01:00
Anders Mannberg
ef8c745f31 Added splashtag info to README 2018-12-15 21:39:35 +01:00
John Sundell
0d1c781af1
Merge pull request #20 from MaciejGad/background_color
Add support for different background colors
2018-10-09 23:30:25 +02:00
John Sundell
6eda8586cc
Merge pull request #23 from viktorgardart/patch-1
Added webkit-overflow-scrolling to improve scrolling on iOS devices.
2018-10-09 23:28:09 +02:00
John Sundell
183224503f
Theme: Nitpicky code style fix 2018-10-09 23:22:50 +02:00
John Sundell
59d45d39e3
Theme: Documentation fix for backgroundColor 2018-10-09 23:22:18 +02:00
John Sundell
cb3f05d3e2
Theme+Defaults: Nitpicky code style fixes 2018-10-09 23:21:35 +02:00
Viktor Gardart
56bb70fb7f
Added webkit-overflow-scrolling to improve scrolling on iOS devices. 2018-10-05 23:20:26 +02:00
John Sundell
1dfa17227f
Merge pull request #22 from JohnSundell/custom-grammars
Make it easier to build custom grammars
2018-09-28 19:03:27 +02:00
John Sundell
4c6f71c0de Support custom token types
This change makes it possible to implement custom token types, which is
really useful when building specialized grammars that use non-standard
token types.
2018-09-28 14:02:42 +02:00
John Sundell
98bfad4ea4 SwiftGrammar: Enable delimiters and syntax rules to be mutated
This enables easy creation of custom grammars that are based on the Swift one.
2018-09-28 13:52:51 +02:00
Maciej Gad
1c6998d5f5 add support for different background colors 2018-09-23 14:06:09 +02:00
John Sundell
30b9300441 StatementTests: Nitpicky code style fixes 2018-09-06 08:41:50 +02:00
John Sundell
88961141d4
Merge pull request #16 from marcocapano/patch-1
Add support for new keywords
2018-09-06 08:39:16 +02:00
John Sundell
b2c849e93e
SwiftGrammar: Add missing keyword separator
Lost in merge conflict resolution
2018-09-05 23:36:12 +02:00
John Sundell
2a049c2031
Merge branch 'master' into patch-1 2018-09-05 23:32:15 +02:00
John Sundell
5d4ac97678
Merge pull request #15 from nik6018/master
added "inout" as keyword
2018-09-05 23:28:19 +02:00
Marco Capano
2af2ec9d57
Fixing tests
This fixes a missing .whitespace in testForStatementWithContinue and handles indentation in testRepeatWhileStatement
2018-09-05 19:11:16 +02:00
Marco Capano
b8bc4ff2c3
Updating allTests static var 2018-09-05 18:45:53 +02:00
Marco Capano
3c638adcf5
Adding tests for repeat, while, continue and Fallthrough 2018-09-05 18:43:22 +02:00
Marco Capano
338e3b6ef9
Adding "while" keyword 2018-09-05 18:40:27 +02:00
Luffy
7a2f284e5d missed a component in the test declaration 2018-09-05 07:20:35 +05:30
Nikhil Muskur
70f49996fc
added the test case in allTests array 2018-09-05 07:06:01 +05:30
Nikhil Muskur
ea71fd7191
test added for the "inout" keyword 2018-09-05 06:58:51 +05:30
Marco Capano
32764b0720
Add support for continue, fallthrough and repeat
This PR introduces new keywords in SwiftGrammar
2018-09-04 22:26:29 +02:00
Nikhil Muskur
b742c3cfa3
added "inout" as keyword 2018-09-04 16:30:42 +05:30
John Sundell
187effae29 DeclarationTests: Nitpicky code style fixes 2018-08-28 13:23:04 +02:00
John Sundell
90a927cb71
Merge pull request #14 from hotogwc/fix_defer_bug
added “defer” as a keyword
2018-08-28 13:20:44 +02:00
wangchi
c1465b0a65 added “defer” as a keyword 2018-08-28 16:06:43 +08:00
John Sundell
1559117b5a
Merge pull request #13 from JohnSundell/keyword-parameter-labels
Don’t highlight keywords when used as a parameter label
2018-08-27 19:15:22 +02:00
John Sundell
b8584cd396
Merge pull request #12 from JohnSundell/self-as-static-property
Highlight ‘self’ as keyword when used to refer to a type
2018-08-27 19:02:08 +02:00
John Sundell
ac9b512013 Don’t highlight keywords when used as a parameter label
Most keywords can be used as parameter labels, such as “for” or “in”, but
they shouldn’t be highlighted in that context.
2018-08-27 19:01:57 +02:00
John Sundell
0e90f5d86c
Merge pull request #11 from JohnSundell/subscript-declarations
Correctly highlight subscript declarations
2018-08-27 18:44:28 +02:00