Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions

View File

@@ -1,8 +1,12 @@
{
"name": "theme-quietlight",
"version": "0.1.0",
"displayName": "%displayName%",
"description": "%description%",
"version": "1.0.0",
"publisher": "vscode",
"engines": { "vscode": "*" },
"engines": {
"vscode": "*"
},
"contributes": {
"themes": [
{

View File

@@ -0,0 +1,4 @@
{
"displayName": "Quiet Light Theme",
"description": "Quiet light theme for Visual Studio Code"
}

View File

@@ -1,625 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>author</key>
<string>Martin Kühl</string>
<key>comment</key>
<string>Based on the Quiet Light theme for Espresso by Ian Beck.</string>
<key>name</key>
<string>Quiet Light</string>
<key>settings</key>
<array>
<dict>
<key>settings</key>
<dict>
<key>background</key>
<string>#F5F5F5</string>
<key>caret</key>
<string>#000000</string>
<key>foreground</key>
<string>#333333</string>
<key>invisibles</key>
<string>#AAAAAA</string>
<key>lineHighlight</key>
<string>#E4F6D4</string>
<key>selection</key>
<string>#C9D0D9</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Comments</string>
<key>scope</key>
<string>comment, punctuation.definition.comment</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>italic</string>
<key>foreground</key>
<string>#AAAAAA</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Comments: Preprocessor</string>
<key>scope</key>
<string>comment.block.preprocessor</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#AAAAAA</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Comments: Documentation</string>
<key>scope</key>
<string>comment.documentation, comment.block.documentation</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#448C27</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Invalid - Deprecated</string>
<key>scope</key>
<string>invalid.deprecated</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#96000014</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Invalid - Illegal</string>
<key>scope</key>
<string>invalid.illegal</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#96000014</string>
<key>foreground</key>
<string>#660000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Operators</string>
<key>scope</key>
<string>keyword.operator</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#777777</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Keywords</string>
<key>scope</key>
<string>keyword, storage</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#4B83CD</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Types</string>
<key>scope</key>
<string>storage.type, support.type</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#7A3E9D</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Language Constants</string>
<key>scope</key>
<string>constant.language, support.constant, variable.language</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AB6526</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Variables</string>
<key>scope</key>
<string>variable, support.variable</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#7A3E9D</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Functions</string>
<key>scope</key>
<string>entity.name.function, support.function</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>bold</string>
<key>foreground</key>
<string>#AA3731</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Classes</string>
<key>scope</key>
<string>entity.name.type, entity.other.inherited-class, support.class</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>bold</string>
<key>foreground</key>
<string>#7A3E9D</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Exceptions</string>
<key>scope</key>
<string>entity.name.exception</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#660000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Sections</string>
<key>scope</key>
<string>entity.name.section</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Numbers, Characters</string>
<key>scope</key>
<string>constant.numeric, constant.character, constant</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AB6526</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Strings</string>
<key>scope</key>
<string>string</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#448C27</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Strings: Escape Sequences</string>
<key>scope</key>
<string>constant.character.escape</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#777777</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Strings: Regular Expressions</string>
<key>scope</key>
<string>string.regexp</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#4B83CD</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Strings: Symbols</string>
<key>scope</key>
<string>constant.other.symbol</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AB6526</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Punctuation</string>
<key>scope</key>
<string>punctuation</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#777777</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Embedded Source</string>
<key>scope</key>
<string>string source, text source</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#EAEBE6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>-----------------------------------</string>
<key>settings</key>
<dict/>
</dict>
<dict>
<key>name</key>
<string>HTML: Doctype Declaration</string>
<key>scope</key>
<string>meta.tag.sgml.doctype, meta.tag.sgml.doctype string, meta.tag.sgml.doctype entity.name.tag, meta.tag.sgml punctuation.definition.tag.html</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AAAAAA</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>HTML: Tags</string>
<key>scope</key>
<string>meta.tag, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#91B3E0</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>HTML: Tag Names</string>
<key>scope</key>
<string>entity.name.tag</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#4B83CD</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>HTML: Attribute Names</string>
<key>scope</key>
<string>meta.tag entity.other.attribute-name, entity.other.attribute-name.html</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>italic</string>
<key>foreground</key>
<string>#91B3E0</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>HTML: Entities</string>
<key>scope</key>
<string>constant.character.entity, punctuation.definition.entity</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AB6526</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>-----------------------------------</string>
<key>settings</key>
<dict/>
</dict>
<dict>
<key>name</key>
<string>CSS: Selectors</string>
<key>scope</key>
<string>meta.selector, meta.selector entity, meta.selector entity punctuation, entity.name.tag.css</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#7A3E9D</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>CSS: Property Names</string>
<key>scope</key>
<string>meta.property-name, support.type.property-name</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AB6526</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>CSS: Property Values</string>
<key>scope</key>
<string>meta.property-value, meta.property-value constant.other, support.constant.property-value</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#448C27</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>CSS: Important Keyword</string>
<key>scope</key>
<string>keyword.other.important</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>-----------------------------------</string>
<key>settings</key>
<dict/>
</dict>
<dict>
<key>name</key>
<string>Markup: Changed</string>
<key>scope</key>
<string>markup.changed</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#FFFFDD</string>
<key>foreground</key>
<string>#000000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Deletion</string>
<key>scope</key>
<string>markup.deleted</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#FFDDDD</string>
<key>foreground</key>
<string>#000000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Emphasis</string>
<key>scope</key>
<string>markup.italic</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>italic</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Error</string>
<key>scope</key>
<string>markup.error</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#96000014</string>
<key>foreground</key>
<string>#660000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Insertion</string>
<key>scope</key>
<string>markup.inserted</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#DDFFDD</string>
<key>foreground</key>
<string>#000000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Link</string>
<key>scope</key>
<string>meta.link</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#4B83CD</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Output</string>
<key>scope</key>
<string>markup.output, markup.raw</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#777777</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Prompt</string>
<key>scope</key>
<string>markup.prompt</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#777777</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Heading</string>
<key>scope</key>
<string>markup.heading</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#AA3731</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Strong</string>
<key>scope</key>
<string>markup.bold</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Traceback</string>
<key>scope</key>
<string>markup.traceback</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#660000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup: Underline</string>
<key>scope</key>
<string>markup.underline</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>underline</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup Quote</string>
<key>scope</key>
<string>markup.quote</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#7A3E9D</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup Lists</string>
<key>scope</key>
<string>markup.list</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#4B83CD</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup Styling</string>
<key>scope</key>
<string>markup.bold, markup.italic</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#448C27</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Markup Inline</string>
<key>scope</key>
<string>markup.inline.raw</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#AB6526</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>-----------------------------------</string>
<key>settings</key>
<dict/>
</dict>
<dict>
<key>name</key>
<string>Extra: Diff Range</string>
<key>scope</key>
<string>meta.diff.range, meta.diff.index, meta.separator</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#DDDDFF</string>
<key>foreground</key>
<string>#434343</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Extra: Diff From</string>
<key>scope</key>
<string>meta.diff.header.from-file</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#FFDDDD</string>
<key>foreground</key>
<string>#434343</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Extra: Diff To</string>
<key>scope</key>
<string>meta.diff.header.to-file</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#DDFFDD</string>
<key>foreground</key>
<string>#434343</string>
</dict>
</dict>
</array>
<key>uuid</key>
<string>231D6A91-5FD1-4CBE-BD2A-0F36C08693F1</string>
</dict>
</plist>

View File

@@ -486,6 +486,7 @@
"pickerGroup.border": "#749351",
"list.activeSelectionForeground": "#6c6c6c",
"list.focusBackground": "#CADEB9",
"list.hoverBackground": "#e0e0e0",
"list.activeSelectionBackground": "#c4d9b1",
"list.inactiveSelectionBackground": "#d3dbcd",
"list.highlightForeground": "#9769dc",
@@ -493,6 +494,7 @@
"editor.background": "#F5F5F5",
"editorWhitespace.foreground": "#AAAAAA",
"editor.lineHighlightBackground": "#E4F6D4",
"editorActiveLineNumber.foreground": "#9769dc",
"editor.selectionBackground": "#C9D0D9",
"panel.background": "#F5F5F5",
"sideBar.background": "#F2F2F2",