Markdown fixes (#18704)

* Fix typos

* Add Go, Rust and Scala

* Adjust Go, Rust and Scala's logic as per #17591
This commit is contained in:
Morag S
2017-01-20 22:51:09 +02:00
committed by Matt Bierner
parent d85dc993f9
commit 22cc4a1ce7

View File

@@ -142,6 +142,10 @@
<key>include</key>
<string>#fenced_code_block_git_rebase</string>
</dict>
<dict>
<key>include</key>
<string>#fenced_code_block_go</string>
</dict>
<dict>
<key>include</key>
<string>#fenced_code_block_groovy</string>
@@ -186,6 +190,14 @@
<key>include</key>
<string>#fenced_code_block_regexp_python</string>
</dict>
<dict>
<key>include</key>
<string>#fenced_code_block_rust</string>
</dict>
<dict>
<key>include</key>
<string>#fenced_code_block_scala</string>
</dict>
<dict>
<key>include</key>
<string>#fenced_code_block_shell</string>
@@ -1832,6 +1844,58 @@
</dict>
</array>
</dict>
<key>fenced_code_block_go</key>
<dict>
<key>begin</key>
<string>(^|\G)(\s*)([`~]{3,})\s*((go|golang)(\s+.*)?$)</string>
<key>name</key>
<string>markup.fenced_code.block.markdown</string>
<key>end</key>
<string>(^|\G)(\2|\s{0,3})(\3)\s*$</string>
<key>beginCaptures</key>
<dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.definition.markdown</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>fenced_code.block.language</string>
</dict>
<key>6</key>
<dict>
<key>name</key>
<string>fenced_code.block.language.attributes</string>
</dict>
</dict>
<key>endCaptures</key>
<dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.definition.markdown</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>(^|\G)(\s*)(.*)</string>
<key>while</key>
<string>(^|\G)(?!\s*([`~]{3,})\s*$)</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>source.go</string>
</dict>
</array>
</dict>
</array>
</dict>
<key>fenced_code_block_groovy</key>
<dict>
<key>begin</key>
@@ -2334,7 +2398,6 @@
<string>punctuation.definition.markdown</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
@@ -2404,6 +2467,110 @@
</dict>
</array>
</dict>
<key>fenced_code_block_rust</key>
<dict>
<key>begin</key>
<string>(^|\G)(\s*)([`~]{3,})\s*((rust|rs)(\s+.*)?$)</string>
<key>name</key>
<string>markup.fenced_code.block.markdown</string>
<key>end</key>
<string>(^|\G)(\2|\s{0,3})(\3)\s*$</string>
<key>beginCaptures</key>
<dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.definition.markdown</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>fenced_code.block.language</string>
</dict>
<key>6</key>
<dict>
<key>name</key>
<string>fenced_code.block.language.attributes</string>
</dict>
</dict>
<key>endCaptures</key>
<dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.definition.markdown</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>(^|\G)(\s*)(.*)</string>
<key>while</key>
<string>(^|\G)(?!\s*([`~]{3,})\s*$)</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>source.rust</string>
</dict>
</array>
</dict>
</array>
</dict>
<key>fenced_code_block_scala</key>
<dict>
<key>begin</key>
<string>(^|\G)(\s*)([`~]{3,})\s*((scala|sbt)(\s+.*)?$)</string>
<key>name</key>
<string>markup.fenced_code.block.markdown</string>
<key>end</key>
<string>(^|\G)(\2|\s{0,3})(\3)\s*$</string>
<key>beginCaptures</key>
<dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.definition.markdown</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>fenced_code.block.language</string>
</dict>
<key>6</key>
<dict>
<key>name</key>
<string>fenced_code.block.language.attributes</string>
</dict>
</dict>
<key>endCaptures</key>
<dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.definition.markdown</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>(^|\G)(\s*)(.*)</string>
<key>while</key>
<string>(^|\G)(?!\s*([`~]{3,})\s*$)</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>source.scala</string>
</dict>
</array>
</dict>
</array>
</dict>
<key>fenced_code_block_shell</key>
<dict>
<key>begin</key>
@@ -2757,9 +2924,9 @@
)
| ( # Inline Link
\( # Opening paren
[ \t]*+ # Optional whtiespace
[ \t]*+ # Optional whitespace
&lt;?(.*?)&gt;? # URL
[ \t]*+ # Optional whtiespace
[ \t]*+ # Optional whitespace
( # Optional Title
(?&lt;title&gt;['"])
(.*?)