API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 17th, 2019
69
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.15 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/source.scala.json b/source.scala.json
  2. index 1491594..9586413 100644
  3. --- a/source.scala.json
  4. +++ b/source.scala.json
  5. @@ -16,7 +16,7 @@
  6. "include": "#block-comments"
  7. },
  8. {
  9. - "match": "(?x)\n\t\t\t(?! /\\*)\n\t\t\t(?! \\*/)\n\t\t "
  10. + "match": "(?x)(?! /\\*)(?! \\*/)"
  11. }
  12. ]
  13. },
  14. @@ -248,7 +248,7 @@
  15. "declarations": {
  16. "patterns": [
  17. {
  18. - "match": "(?x)\n\t\t\t\t\t\t\\b(def)\\s+\n\t\t\t\t\t\t(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\\t .,;()\\[\\]{}'\"`\\w])(?=[(\\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~\u003e\u003c^+*%:!#|/@\\\\]+)",
  19. + "match": "(?x)\\b(def)\\s+(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))",
  20. "captures": {
  21. "1": {
  22. "name": "keyword.declaration.scala"
  23. @@ -284,7 +284,7 @@
  24. }
  25. },
  26. {
  27. - "match": "\\b(type)\\s+(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\\s])(?=[\\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~\u003e\u003c^+*%:!#|/@\\\\]+)",
  28. + "match": "\\b(type)\\s+(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))",
  29. "captures": {
  30. "1": {
  31. "name": "keyword.declaration.scala"
  32. @@ -295,7 +295,7 @@
  33. }
  34. },
  35. {
  36. - "match": "\\b(val)\\s+(?:([A-Z][_a-zA-Z0-9]*))\\b",
  37. + "match": "\\b(val)\\s+([A-Z\\p{Lt}\\p{Lu}](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?)\\b",
  38. "captures": {
  39. "1": {
  40. "name": "keyword.declaration.stable.scala"
  41. @@ -306,7 +306,7 @@
  42. }
  43. },
  44. {
  45. - "match": "\\b(?:(val)|(var))\\s+(?:(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\\t .,;()\\[\\]{}'\"`\\w])(?=[\\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~\u003e\u003c^+*%:!#|/@\\\\]+)|(?=\\())",
  46. + "match": "\\b(?:(val)|(var))\\s+(?:(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))|(?=\\())",
  47. "captures": {
  48. "1": {
  49. "name": "keyword.declaration.stable.scala"
  50. @@ -343,7 +343,7 @@
  51. },
  52. {
  53. "name": "entity.name.package.scala",
  54. - "match": "(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*)"
  55. + "match": "(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))"
  56. },
  57. {
  58. "name": "punctuation.definition.package",
  59. @@ -377,7 +377,7 @@
  60. },
  61. {
  62. "name": "entity.name.import.scala",
  63. - "match": "(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*)"
  64. + "match": "(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))"
  65. },
  66. {
  67. "name": "punctuation.definition.import",
  68. @@ -389,7 +389,7 @@
  69. "end": "}",
  70. "patterns": [
  71. {
  72. - "match": "(?x) \\s*\n\t\t\t\t (`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*) \\s*\n\t\t\t\t (=\u003e) \\s*\n\t\t\t\t (`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*) \\s*\n\t\t\t ",
  73. + "match": "(?x)\\s*(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))\\s*(=\u003e)\\s*(`[^`]+`|(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))\\s*",
  74. "captures": {
  75. "1": {
  76. "name": "entity.name.import.renamed-from.scala"
  77. @@ -518,7 +518,7 @@
  78. "parameter-list": {
  79. "patterns": [
  80. {
  81. - "match": "(?\u003c=[^\\._$a-zA-Z0-9])(`[^`]+`|[_$a-z][_$a-zA-Z0-9]*(?:_[^\\s])(?=[\\t ])|[_$a-z][_$a-zA-Z0-9]*|[-?~\u003e\u003c^+*%:!#|/@\\\\]+)\\s*(:)\\s+",
  82. + "match": "(?\u003c=[^\\._$a-zA-Z0-9])(`[^`]+`|[_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?)\\s*(:)\\s+",
  83. "captures": {
  84. "1": {
  85. "name": "variable.parameter.scala"
  86. @@ -544,7 +544,7 @@
  87. },
  88. "scala-symbol": {
  89. "name": "constant.other.symbol.scala",
  90. - "match": "'\\w+(?=[^'\\w]|$)"
  91. + "match": "(?\u003e'(?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]]+)?|(?:[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~[\\p{Sm}\\p{So}]])+))(?!')"
  92. },
  93. "script-header": {
  94. "name": "comment.block.shebang.scala",
  95. @@ -570,6 +570,42 @@
  96. }
  97. ]
  98. },
  99. + "string-interpolation": {
  100. + "patterns": [
  101. + {
  102. + "name": "constant.character.escape.interpolation.scala",
  103. + "match": "\\$\\$"
  104. + },
  105. + {
  106. + "match": "(\\$)([[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]](?:[[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]|[0-9])*)",
  107. + "captures": {
  108. + "1": {
  109. + "name": "punctuation.definition.template-expression.begin.scala"
  110. + }
  111. + }
  112. + },
  113. + {
  114. + "name": "punctuation.definition.template-expression.scala",
  115. + "begin": "\\$\\{",
  116. + "end": "\\}",
  117. + "patterns": [
  118. + {
  119. + "include": "#code"
  120. + }
  121. + ],
  122. + "beginCaptures": {
  123. + "0": {
  124. + "name": "punctuation.definition.template-expression.begin.scala"
  125. + }
  126. + },
  127. + "endCaptures": {
  128. + "0": {
  129. + "name": "punctuation.definition.template-expression.end.scala"
  130. + }
  131. + }
  132. + }
  133. + ]
  134. + },
  135. "strings": {
  136. "patterns": [
  137. {
  138. @@ -593,6 +629,36 @@
  139. }
  140. }
  141. },
  142. + {
  143. + "begin": "\\b([[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]+)(\"\"\")",
  144. + "end": "\"\"\"(?!\")",
  145. + "patterns": [
  146. + {
  147. + "include": "#string-interpolation"
  148. + },
  149. + {
  150. + "name": "constant.character.escape.scala",
  151. + "match": "\\\\\\\\|\\\\u[0-9A-Fa-f]{4}"
  152. + },
  153. + {
  154. + "name": "string.quoted.triple.interpolated.scala",
  155. + "match": "."
  156. + }
  157. + ],
  158. + "beginCaptures": {
  159. + "1": {
  160. + "name": "keyword.interpolation.scala"
  161. + },
  162. + "2": {
  163. + "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala"
  164. + }
  165. + },
  166. + "endCaptures": {
  167. + "0": {
  168. + "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala"
  169. + }
  170. + }
  171. + },
  172. {
  173. "name": "string.quoted.double.scala",
  174. "begin": "\"",
  175. @@ -617,6 +683,40 @@
  176. "name": "punctuation.definition.string.end.scala"
  177. }
  178. }
  179. + },
  180. + {
  181. + "begin": "\\b([[A-Z\\p{Lt}\\p{Lu}][_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]]+)(\")",
  182. + "end": "\"",
  183. + "patterns": [
  184. + {
  185. + "include": "#string-interpolation"
  186. + },
  187. + {
  188. + "name": "constant.character.escape.scala",
  189. + "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})"
  190. + },
  191. + {
  192. + "name": "invalid.illegal.unrecognized-string-escape.scala",
  193. + "match": "\\\\."
  194. + },
  195. + {
  196. + "name": "string.quoted.double.interpolated.scala",
  197. + "match": "."
  198. + }
  199. + ],
  200. + "beginCaptures": {
  201. + "1": {
  202. + "name": "keyword.interpolation.scala"
  203. + },
  204. + "2": {
  205. + "name": "string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala"
  206. + }
  207. + },
  208. + "endCaptures": {
  209. + "0": {
  210. + "name": "string.quoted.double.interpolated.scala punctuation.definition.string.end.scala"
  211. + }
  212. + }
  213. }
  214. ]
  215. },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!