Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: davesag/Solidity.tmbundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1
Choose a base ref
...
head repository: davesag/Solidity.tmbundle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 30, 2017

  1. minor alts to capture events and modifiers

    @davesag
    davesag committed Oct 30, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    51564df View commit details

Commits on Nov 2, 2017

  1. n/a added library keyword

    @davesag
    davesag committed Nov 2, 2017
    Copy the full SHA
    77a7490 View commit details
Showing with 65 additions and 136 deletions.
  1. +49 −89 Syntaxes/Solidity.tmLanguage
  2. +16 −47 Themes/Solidity.tmTheme
138 changes: 49 additions & 89 deletions Syntaxes/Solidity.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<string>sol</string>
</array>
<key>firstLineMatch</key>
<string>^#!/.*\b(pragma|contract|import)$\n?</string>
<string>^#!/.*\b(pragma solidity \^[0..9]+\.[0..9]\.[0..9])$\n?</string>
<key>keyEquivalent</key>
<string>^~S</string>
<key>name</key>
@@ -182,10 +182,6 @@
<key>include</key>
<string>#literal-number</string>
</dict>
<dict>
<key>include</key>
<string>#literal-quasi</string>
</dict>
<dict>
<key>include</key>
<string>#literal-string</string>
@@ -202,6 +198,10 @@
<key>include</key>
<string>#literal-contract</string>
</dict>
<dict>
<key>include</key>
<string>#literal-library</string>
</dict>
<dict>
<key>include</key>
<string>#literal-function-call</string>
@@ -277,18 +277,51 @@
<array>
<dict>
<key>begin</key>
<string>(?x) (?&lt;!\.)\b(contract) \s+((?!\b(is)\b)[_$a-zA-Z][$\w]*)?</string>
<string>(?x) (?&lt;!\.)\b(contract|interface) \s+((?!\b(is)\b)[A-Z][$\w]*)?</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>storage.type.class.sol</string>
<string>storage.type.contract.sol</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>entity.name.class.sol</string>
<string>entity.name.contract.sol</string>
</dict>
</dict>
<key>end</key>
<string>}</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>meta.brace.curly.sol</string>
</dict>
</dict>
</dict>
</array>
</dict>
<key>literal-library</key>
<dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>(?x) (?&lt;!\.)\b(library) \s+([A-Z][$\w]*)?</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>storage.type.library.sol</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>entity.name.library.sol</string>
</dict>
</dict>
<key>end</key>
@@ -415,7 +448,7 @@
<key>begin</key>
<string>
(?x) (\b[_$a-zA-Z][$\w]*) \s*=
\s*(function)(?:\s*(\*)|(?=\s|[(]))
\s*(function|event|modifier)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)?\s*
</string>
<key>beginCaptures</key>
@@ -525,8 +558,8 @@
<key>begin</key>
<string>
(?x) (\b_?[A-Z][$\w]*)? (\.)([_$a-zA-Z][$\w]*) \s*=
\s*(function)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)?\s*
\s*(function|event|modifier)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)*\s*
</string>
<key>beginCaptures</key>
<dict>
@@ -622,8 +655,8 @@
<key>begin</key>
<string>
(?x) \b([_$a-zA-Z][$\w]*) \s*(:)
\s*(function)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)?\s*
\s*(function|event|modifier)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)*\s*
</string>
<key>beginCaptures</key>
<dict>
@@ -674,8 +707,8 @@
(?x) (?:
((')((?:[^']|\\')*)('))|
((")((?:[^"]|\\")*)(")) ) \s*(:)
\s*(function)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)?\s*
\s*(function|event|modifier)(?:\s*(\*)|(?=\s|[(]))
\s*([_$a-zA-Z][$\w]*)*\s*
</string>
<key>beginCaptures</key>
<dict>
@@ -1098,79 +1131,6 @@
</dict>
</array>
</dict>
<key>literal-quasi</key>
<dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>([a-zA-Z$_][\w$_]*)?(`)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>entity.quasi.tag.name.sol</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.quasi.begin.sol</string>
</dict>
</dict>
<key>end</key>
<string>`</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.quasi.end.sol</string>
</dict>
</dict>
<key>name</key>
<string>string.quasi.sol</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string-content</string>
</dict>
<dict>
<key>begin</key>
<string>\${</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.quasi.element.begin.sol</string>
</dict>
</dict>
<key>end</key>
<string>}</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.quasi.element.end.sol</string>
</dict>
</dict>
<key>name</key>
<string>entity.quasi.element.sol</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
</array>
</dict>
</array>
</dict>
<key>literal-regexp</key>
<dict>
<key>patterns</key>
@@ -1179,7 +1139,7 @@
<key>begin</key>
<string>
(?x) (?&lt;=
\.|\(|,|{|}|\[|;|,|&lt;|&gt;|&lt;=|&gt;=|==|!=|==|!=|\+|-|\*|%|\+\+|--|&lt;&lt;|&gt;&gt;|&gt;&gt;&gt;|&amp;|\||\^|!|~|&amp;&amp;|\|\||\?|:|=|\+=|-=|\*=|%=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&amp;=|\|=|\^=|/|/=| \Wnew|\Wdelete|\Wvoid|\Wreturn| ^new|^delete|^void|^return|^ )\s* (/) (?!/|\*|$)
\.|\(|,|{|}|\[|;|,|&lt;|&gt;|&lt;=|&gt;=|==|!=|\+|-|\*|%|\+\+|--|&lt;&lt;|&gt;&gt;|&gt;&gt;&gt;|&amp;|\||\^|!|~|&amp;&amp;|\|\||\?|:|=|\+=|-=|\*=|%=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&amp;=|\|=|\^=|/|/=| \Wnew|\Wdelete|\Wvoid|\Wreturn| ^new|^delete|^void|^return|^ )\s* (/) (?!/|\*|$)
</string>
<key>beginCaptures</key>
<dict>
63 changes: 16 additions & 47 deletions Themes/Solidity.tmTheme
View file
Original file line number Diff line number Diff line change
@@ -444,7 +444,7 @@
</dict>
<dict>
<key>name</key>
<string>js object</string>
<string>solidity object</string>
<key>scope</key>
<string>variable.other.object.sol</string>
<key>settings</key>
@@ -530,28 +530,6 @@
<string>#AA0044</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>support.class.error.sol</string>
<key>scope</key>
<string>support.class.error.sol</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#FF5522</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>variable.import.destructuring.sol</string>
<key>scope</key>
<string>variable.import.destructuring.sol</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#00BBFF</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>other.object.key.sol</string>
@@ -615,6 +593,19 @@
<string>#0044AA</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>storage.type.library.sol</string>
<key>scope</key>
<string>storage.type.library.sol</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#001122</string>
<key>foreground</key>
<string>#0044AA</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>entity.name.accessor.sol</string>
@@ -678,31 +669,9 @@
</dict>
<dict>
<key>name</key>
<string>punctuation.quasi.element</string>
<key>scope</key>
<string>punctuation.quasi.element</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#008800</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>entity.quasi.tag.name.sol</string>
<key>scope</key>
<string>entity.quasi.tag.name.sol</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#FFFF00</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>meta.group.braces.square, punctuation.destructuring</string>
<string>meta.group.braces.square</string>
<key>scope</key>
<string>meta.group.braces.square string.quoted.single, punctuation.destructuring</string>
<string>meta.group.braces.square string.quoted.single</string>
<key>settings</key>
<dict>
<key>foreground</key>