mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-14 12:08:36 -05:00
Initial VS Code 1.19 source merge (#571)
* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
@@ -303,7 +303,7 @@
|
||||
<key>list_paragraph</key>
|
||||
<dict>
|
||||
<key>begin</key>
|
||||
<string>(^|\G)(?=\S)(?![*+-]\s|[0-9]+\.\s)</string>
|
||||
<string>(^|\G)(?=\S)(?![*+->]\s|[0-9]+\.\s)</string>
|
||||
<key>name</key>
|
||||
<string>meta.paragraph.markdown</string>
|
||||
<key>patterns</key>
|
||||
@@ -322,7 +322,7 @@
|
||||
</dict>
|
||||
</array>
|
||||
<key>while</key>
|
||||
<string>(^|\G)(?!\s*$|#|[ ]{0,3}([-*_][ ]{2,}){3,}[ \t]*$\n?|>|[ ]{0,3}[*+-]|[ ]{0,3}[0-9]+\.)</string>
|
||||
<string>(^|\G)(?!\s*$|#|[ ]{0,3}([-*_>][ ]{2,}){3,}[ \t]*$\n?|[ ]{0,3}[*+->]|[ ]{0,3}[0-9]+\.)</string>
|
||||
</dict>
|
||||
<key>lists</key>
|
||||
<dict>
|
||||
@@ -681,11 +681,16 @@
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.begin.markdown</string>
|
||||
</dict>
|
||||
<key>10</key>
|
||||
<key>9</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>string.other.link.description.title.markdown</string>
|
||||
</dict>
|
||||
<key>10</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.markdown</string>
|
||||
</dict>
|
||||
<key>11</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
@@ -694,12 +699,12 @@
|
||||
<key>12</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.markdown</string>
|
||||
<string>string.other.link.description.title.markdown</string>
|
||||
</dict>
|
||||
<key>13</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>string.other.link.description.title.markdown</string>
|
||||
<string>punctuation.definition.string.markdown</string>
|
||||
</dict>
|
||||
<key>14</key>
|
||||
<dict>
|
||||
@@ -707,11 +712,6 @@
|
||||
<string>punctuation.definition.string.markdown</string>
|
||||
</dict>
|
||||
<key>15</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.markdown</string>
|
||||
</dict>
|
||||
<key>16</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.metadata.markdown</string>
|
||||
@@ -729,24 +729,19 @@
|
||||
<key>5</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>invalid.illegal.whitespace.markdown</string>
|
||||
<string>punctuation.definition.metadata.markdown</string>
|
||||
</dict>
|
||||
<key>6</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.metadata.markdown</string>
|
||||
<string>punctuation.definition.link.markdown</string>
|
||||
</dict>
|
||||
<key>7</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.link.markdown</string>
|
||||
</dict>
|
||||
<key>8</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>markup.underline.link.image.markdown</string>
|
||||
</dict>
|
||||
<key>9</key>
|
||||
<key>8</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.link.markdown</string>
|
||||
@@ -756,7 +751,6 @@
|
||||
<string>(?x:
|
||||
(\!\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])
|
||||
# Match the link text.
|
||||
([ ])? # Space not allowed
|
||||
(\() # Opening paren for url
|
||||
(<?)(\S+?)(>?) # The url
|
||||
[ \t]* # Optional whitespace
|
||||
@@ -993,37 +987,37 @@
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.begin.markdown</string>
|
||||
</dict>
|
||||
<key>10</key>
|
||||
<key>9</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>string.other.link.description.title.markdown</string>
|
||||
</dict>
|
||||
<key>10</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.begin.markdown</string>
|
||||
</dict>
|
||||
<key>11</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.begin.markdown</string>
|
||||
<string>punctuation.definition.string.end.markdown</string>
|
||||
</dict>
|
||||
<key>12</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.end.markdown</string>
|
||||
<string>string.other.link.description.title.markdown</string>
|
||||
</dict>
|
||||
<key>13</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>string.other.link.description.title.markdown</string>
|
||||
<string>punctuation.definition.string.begin.markdown</string>
|
||||
</dict>
|
||||
<key>14</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.begin.markdown</string>
|
||||
</dict>
|
||||
<key>15</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.string.end.markdown</string>
|
||||
</dict>
|
||||
<key>16</key>
|
||||
<key>15</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.metadata.markdown</string>
|
||||
@@ -1041,24 +1035,19 @@
|
||||
<key>5</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>invalid.illegal.whitespace.markdown</string>
|
||||
<string>punctuation.definition.metadata.markdown</string>
|
||||
</dict>
|
||||
<key>6</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.metadata.markdown</string>
|
||||
<string>punctuation.definition.link.markdown</string>
|
||||
</dict>
|
||||
<key>7</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.link.markdown</string>
|
||||
</dict>
|
||||
<key>8</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>markup.underline.link.markdown</string>
|
||||
</dict>
|
||||
<key>9</key>
|
||||
<key>8</key>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>punctuation.definition.link.markdown</string>
|
||||
@@ -1068,7 +1057,6 @@
|
||||
<string>(?x:
|
||||
(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])
|
||||
# Match the link text.
|
||||
([ ])? # Space not allowed
|
||||
(\() # Opening paren for url
|
||||
(<?)(.*?)(>?) # The url
|
||||
[ \t]* # Optional whitespace
|
||||
|
||||
Reference in New Issue
Block a user