mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-13 17:22:15 -05:00
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:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"comments": {
|
||||
"lineComment": "#",
|
||||
"blockComment": [ "'''", "'''" ]
|
||||
"blockComment": [ "\"\"\"", "\"\"\"" ]
|
||||
},
|
||||
"brackets": [
|
||||
["{", "}"],
|
||||
@@ -29,14 +29,16 @@
|
||||
{ "open": "f'", "close": "'", "notIn": ["string", "comment"] },
|
||||
{ "open": "F'", "close": "'", "notIn": ["string", "comment"] },
|
||||
{ "open": "b'", "close": "'", "notIn": ["string", "comment"] },
|
||||
{ "open": "B'", "close": "'", "notIn": ["string", "comment"] }
|
||||
{ "open": "B'", "close": "'", "notIn": ["string", "comment"] },
|
||||
{ "open": "`", "close": "`", "notIn": ["string"] }
|
||||
],
|
||||
"surroundingPairs": [
|
||||
["{", "}"],
|
||||
["[", "]"],
|
||||
["(", ")"],
|
||||
["\"", "\""],
|
||||
["'", "'"]
|
||||
["'", "'"],
|
||||
["`", "`"]
|
||||
],
|
||||
"folding": {
|
||||
"offSide": true,
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
"name": "python",
|
||||
"version": "0.1.0",
|
||||
"displayName": "%displayName%",
|
||||
"description": "%description%",
|
||||
"version": "1.0.0",
|
||||
"publisher": "vscode",
|
||||
"engines": { "vscode": "*" },
|
||||
"activationEvents": ["onLanguage:python"],
|
||||
|
||||
4
extensions/python/package.nls.json
Normal file
4
extensions/python/package.nls.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"displayName": "Python Language Basics",
|
||||
"description": "Provides syntax highlighting, bracket matching and folding in Python files."
|
||||
}
|
||||
@@ -7,27 +7,6 @@
|
||||
"version": "https://github.com/MagicStack/MagicPython/commit/b453f26ed856c9b16a053517c41207e3a72cc7d5",
|
||||
"name": "MagicPython",
|
||||
"scopeName": "source.python",
|
||||
"fileTypes": [
|
||||
"py",
|
||||
"py3",
|
||||
"rpy",
|
||||
"pyw",
|
||||
"cpy",
|
||||
"pyi",
|
||||
"SConstruct",
|
||||
"Sconstruct",
|
||||
"sconstruct",
|
||||
"SConscript",
|
||||
"gyp",
|
||||
"gypi",
|
||||
"wsgi",
|
||||
"kv",
|
||||
"Snakefile",
|
||||
"tac"
|
||||
],
|
||||
"first_line_match": "^#![ \\t]*/.*\\bpython[\\d\\.]*\\b",
|
||||
"firstLineMatch": "^#![ \\t]*/.*\\bpython[\\d\\.]*\\b",
|
||||
"uuid": "742deb57-6e38-4192-bed6-410746efd85d",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#statement"
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
"version": "https://github.com/MagicStack/MagicPython/commit/361a4964a559481330764a447e7bab88d4f1b01b",
|
||||
"name": "MagicRegExp",
|
||||
"scopeName": "source.regexp.python",
|
||||
"fileTypes": [
|
||||
"re"
|
||||
],
|
||||
"uuid": "39e15186-71e6-11e5-b82c-7c6d62900c7c",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#regexp-expression"
|
||||
|
||||
Reference in New Issue
Block a user