Skip to content

Commit 88c45c4

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/master' into alex/tokenization
2 parents 8ba6bc5 + cf1412b commit 88c45c4

50 files changed

Lines changed: 802 additions & 389 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
a code editor with what developers need for their core edit-build-debug cycle. Code
1010
provides comprehensive editing and debugging support, an extensibility model, and lightweight integration with existing tools.
1111

12+
VS Code is updated monthly with new features and bug fixes. You can download it for Windows, Mac and Linux on [VS Code's website](https://code.visualstudio.com/Download). To get the latest releases everyday, you can install the [Insiders version of VS Code](https://code.visualstudio.com/insiders). This builds from the master branch and is updated at least daily.
13+
1214
<p align="center">
1315
<img alt="VS Code in action" src="https://cloud.githubusercontent.com/assets/11839736/16642200/6624dde0-43bd-11e6-8595-c81885ba0dc2.png">
1416
</p>

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ function packageTask(platform, arch, opts) {
269269
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
270270
.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
271271
.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
272-
.pipe(util.cleanNodeModule('pty.js', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']));
272+
.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']));
273273

274274
let all = es.merge(
275275
packageJsonStream,

‎extensions/html/OSSREADME.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
22
[{
33
"name": "js-beautify",
4-
"version": "1.6.4",
4+
"version": "1.6.8",
55
"license": "MIT",
66
"repositoryURL": "https://github.com/beautify-web/js-beautify"
77
},{

‎extensions/html/package.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,17 @@
8787
"string",
8888
"null"
8989
],
90-
"default": "a, abbr, acronym, b, bdo, big, br, button, cite, code, dfn, em, i, img, input, kbd, label, map, object, pre, q, samp, select, small, span, strong, sub, sup, textarea, tt, var",
90+
"default": "a, abbr, acronym, b, bdo, big, br, button, cite, code, dfn, em, i, img, input, kbd, label, map, object, q, samp, select, small, span, strong, sub, sup, textarea, tt, var",
9191
"description": "%html.format.unformatted.desc%"
9292
},
93+
"html.format.contentUnformatted": {
94+
"type": [
95+
"string",
96+
"null"
97+
],
98+
"default": "pre",
99+
"description": "%html.format.contentUnformatted.desc%"
100+
},
93101
"html.format.indentInnerHtml": {
94102
"type": "boolean",
95103
"default": false,
@@ -126,6 +134,13 @@
126134
"default": "head, body, /html",
127135
"description": "%html.format.extraLiners.desc%"
128136
},
137+
"html.format.wrapAttributes": {
138+
"type": "string",
139+
"default": "auto",
140+
"enum": [ "auto", "force", "force-align", "force-expand-multiline" ],
141+
"enumDescriptions": ["%html.format.wrapAttributes.auto%", "%html.format.wrapAttributes.force%", "%html.format.wrapAttributes.forcealign%", "%html.format.wrapAttributes.forcemultiline%"],
142+
"description": "%html.format.wrapAttributes.desc%"
143+
},
129144
"html.suggest.angular1": {
130145
"type": "boolean",
131146
"default": true,

‎extensions/html/package.nls.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
"html.format.enable.desc": "Enable/disable default HTML formatter (requires restart)",
33
"html.format.wrapLineLength.desc": "Maximum amount of characters per line (0 = disable).",
44
"html.format.unformatted.desc": "List of tags, comma separated, that shouldn't be reformatted. 'null' defaults to all tags listed at https://www.w3.org/TR/html5/dom.html#phrasing-content.",
5+
"html.format.contentUnformatted.desc": "List of tags, comma separated, where the content shouldn't be reformatted. 'null' defaults to the 'pre' tag.",
56
"html.format.indentInnerHtml.desc": "Indent <head> and <body> sections.",
67
"html.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved. Only works before elements, not inside tags or for text.",
78
"html.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk. Use 'null' for unlimited.",
89
"html.format.indentHandlebars.desc": "Format and indent {{#foo}} and {{/foo}}.",
910
"html.format.endWithNewline.desc": "End with a newline.",
1011
"html.format.extraLiners.desc": "List of tags, comma separated, that should have an extra newline before them. 'null' defaults to \"head, body, /html\".",
12+
"html.format.wrapAttributes.desc": "Wrap attributes.",
13+
"html.format.wrapAttributes.auto": "Wrap attributes only when line length is exceeded.",
14+
"html.format.wrapAttributes.force": "Wrap each attribute except first.",
15+
"html.format.wrapAttributes.forcealign": "Wrap each attribute except first and keep aligned.",
16+
"html.format.wrapAttributes.forcemultiline": "Wrap each attribute.",
1117
"html.suggest.angular1.desc": "Configures if the built-in HTML language support suggests Angular V1 tags and properties.",
1218
"html.suggest.ionic.desc": "Configures if the built-in HTML language support suggests Ionic tags, properties and values.",
1319
"html.suggest.html5.desc":"Configures if the built-in HTML language support suggests HTML5 tags, properties and values.",

‎extensions/html/server/npm-shrinkwrap.json‎

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/html/server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"dependencies": {
1111
"vscode-css-languageservice": "^2.0.0-next.6",
12-
"vscode-html-languageservice": "^2.0.0-next.3",
12+
"vscode-html-languageservice": "^2.0.0-next.5",
1313
"vscode-languageserver": "3.0.1-alpha.2",
1414
"vscode-nls": "^1.0.7",
1515
"vscode-uri": "^1.0.0"

extensions/javascript/language-configuration.json renamed to extensions/javascript/javascript-language-configuration.json

File renamed without changes.

‎extensions/javascript/package.json‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"extensions": [
2828
".jsx"
2929
],
30-
"configuration": "./language-configuration.json"
30+
"configuration": "./javascript-language-configuration.json"
3131
},
3232
{
3333
"id": "javascript",
@@ -47,19 +47,31 @@
4747
"mimetypes": [
4848
"text/javascript"
4949
],
50-
"configuration": "./language-configuration.json"
50+
"configuration": "./javascript-language-configuration.json"
51+
},
52+
{
53+
"id": "jsx-tags",
54+
"configuration": "./tags-language-configuration.json"
5155
}
5256
],
5357
"grammars": [
5458
{
5559
"language": "javascriptreact",
5660
"scopeName": "source.js",
57-
"path": "./syntaxes/JavaScript.tmLanguage.json"
61+
"path": "./syntaxes/JavaScript.tmLanguage.json",
62+
"embeddedLanguages": {
63+
"meta.tag.js": "jsx-tags",
64+
"meta.tag.without-attributes.js": "jsx-tags"
65+
}
5866
},
5967
{
6068
"language": "javascript",
6169
"scopeName": "source.js",
62-
"path": "./syntaxes/JavaScript.tmLanguage.json"
70+
"path": "./syntaxes/JavaScript.tmLanguage.json",
71+
"embeddedLanguages": {
72+
"meta.tag.js": "jsx-tags",
73+
"meta.tag.without-attributes.js": "jsx-tags"
74+
}
6375
},
6476
{
6577
"scopeName": "source.js.regexp",

‎extensions/javascript/tags-language-configuration.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"comments": {
3+
"blockComment": [ "{/*", "*/}" ]
4+
},
5+
"brackets": [
6+
["{", "}"],
7+
["[", "]"],
8+
["(", ")"],
9+
["<", ">"]
10+
],
11+
"autoClosingPairs": [
12+
{ "open": "{", "close": "}" },
13+
{ "open": "[", "close": "]" },
14+
{ "open": "(", "close": ")" },
15+
{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
16+
{ "open": "\"", "close": "\"", "notIn": ["string"] },
17+
{ "open": "/**", "close": " */", "notIn": ["string"] }
18+
],
19+
"surroundingPairs": [
20+
["{", "}"],
21+
["[", "]"],
22+
["(", ")"],
23+
["<", ">"],
24+
["'", "'"],
25+
["\"", "\""]
26+
]
27+
}

0 commit comments

Comments
 (0)