Skip to content

Commit

Permalink
Merge from vscode 10492ba
Browse files Browse the repository at this point in the history
  • Loading branch information
ADS Merger committed Apr 8, 2020
1 parent fca2344 commit 1868a7d
Show file tree
Hide file tree
Showing 339 changed files with 3,766 additions and 3,117 deletions.
232 changes: 176 additions & 56 deletions .eslintrc.json
View file

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ name: CI

on:
push:
branches:
- master
- release/*
pull_request:
branches:
- master
- release/*
branches-ignore:
- '**'
# push:
# branches:
# - master
# - release/*
# pull_request:
# branches:
# - master
# - release/*

jobs:
linux:
Expand Down
7 changes: 0 additions & 7 deletions build/builtInExtensions.json
View file

This file was deleted.

10 changes: 2 additions & 8 deletions build/builtin/browser-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ const os = require('os');
const { remote } = require('electron');
const dialog = remote.dialog;

const productJsonPath = path.join(__dirname, '..', '..', 'product.json');
const builtInExtensionsPath = path.join(__dirname, '..', 'builtInExtensions.json');
const builtInExtensionsPath = path.join(__dirname, '..', '..', 'product.json');
const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');

function readJson(filePath) {
Expand Down Expand Up @@ -51,7 +50,6 @@ function render(el, state) {
}

const ul = document.createElement('ul');
const { quality } = readJson(productJsonPath);
const { builtin, control } = state;

for (const ext of builtin) {
Expand All @@ -62,10 +60,6 @@ function render(el, state) {

const name = document.createElement('code');
name.textContent = ext.name;
if (quality && ext.forQualities && !ext.forQualities.includes(quality)) {
name.textContent += ` (only on ${ext.forQualities.join(', ')})`;
}

li.appendChild(name);

const form = document.createElement('form');
Expand Down Expand Up @@ -116,7 +110,7 @@ function render(el, state) {

function main() {
const el = document.getElementById('extensions');
const builtin = readJson(builtInExtensionsPath);
const builtin = readJson(builtInExtensionsPath).builtInExtensions;
let control;

try {
Expand Down
2 changes: 1 addition & 1 deletion build/gulpfile.hygiene.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ const tsHygieneFilter = [
'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts', // {{SQL CARBON EDIT}},
'!extensions/big-data-cluster/src/bigDataCluster/controller/tokenApiGenerated.ts', // {{SQL CARBON EDIT}},
'!src/vs/workbench/services/themes/common/textMateScopeMatcher.ts', // {{SQL CARBON EDIT}} skip this because we have no plans on touching this and its not ours
'!src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts' // {{SQL CARBON EDIT}} skip this because known issue
'!src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts' // {{SQL CARBON EDIT}} skip this because known issue
];

const copyrightHeaderLines = [
Expand Down
2 changes: 1 addition & 1 deletion build/lib/builtInExtensions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const fancyLog = require('fancy-log');
const ansiColors = require('ansi-colors');

const root = path.dirname(path.dirname(__dirname));
const builtInExtensions = require('../builtInExtensions.json');
const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];

Expand Down
5 changes: 1 addition & 4 deletions build/lib/extensions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const util = require('./util');
const root = path.dirname(path.dirname(__dirname));
const commit = util.getVersion(root);
const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
const product = require('../../product.json');
function fromLocal(extensionPath) {
const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
const input = fs.existsSync(webpackFilename)
Expand Down Expand Up @@ -189,7 +188,6 @@ const excludedExtensions = [
'ms-vscode.node-debug',
'ms-vscode.node-debug2',
'integration-tests',
'ms.vscode.js-debug-nightly'
];
// {{SQL CARBON EDIT}}
const externalExtensions = [
Expand All @@ -215,8 +213,7 @@ const rebuildExtensions = [
'big-data-cluster',
'mssql'
];
const builtInExtensions = require('../builtInExtensions.json')
.filter(({ forQualities }) => { var _a; return !product.quality || ((_a = forQualities === null || forQualities === void 0 ? void 0 : forQualities.includes) === null || _a === void 0 ? void 0 : _a.call(forQualities, product.quality)) !== false; });
const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
function packageLocalExtensionsStream() {
const localExtensionDescriptions = glob.sync('extensions/*/package.json')
.map(manifestPath => {
Expand Down
6 changes: 1 addition & 5 deletions build/lib/extensions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const util = require('./util');
const root = path.dirname(path.dirname(__dirname));
const commit = util.getVersion(root);
const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
const product = require('../../product.json');

function fromLocal(extensionPath: string): Stream {
const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
Expand Down Expand Up @@ -223,7 +222,6 @@ const excludedExtensions = [
'ms-vscode.node-debug',
'ms-vscode.node-debug2',
'integration-tests', // {{SQL CARBON EDIT}}
'ms.vscode.js-debug-nightly'
];

// {{SQL CARBON EDIT}}
Expand Down Expand Up @@ -256,12 +254,10 @@ interface IBuiltInExtension {
name: string;
version: string;
repo: string;
forQualities?: ReadonlyArray<string>;
metadata: any;
}

const builtInExtensions = (<IBuiltInExtension[]>require('../builtInExtensions.json'))
.filter(({ forQualities }) => !product.quality || forQualities?.includes?.(product.quality) !== false);
const builtInExtensions: IBuiltInExtension[] = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;

export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))
Expand Down
2 changes: 1 addition & 1 deletion build/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"iconv-lite": "0.4.23",
"mime": "^1.3.4",
"minimatch": "3.0.4",
"minimist": "^1.2.2",
"minimist": "^1.2.3",
"request": "^2.85.0",
"rollup": "^1.20.3",
"rollup-plugin-commonjs": "^10.1.0",
Expand Down
8 changes: 4 additions & 4 deletions build/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2450,10 +2450,10 @@ minimist@0.0.8:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==
minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==

minimist@~0.0.1:
version "0.0.10"
Expand Down
31 changes: 28 additions & 3 deletions extensions/git/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,31 @@
"command": "git.ignore",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification@3"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "1_modification"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "1_modification"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
},
{
"command": "git.ignore",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "1_modification@3"
}
],
"scm/resourceState/context": [
Expand Down Expand Up @@ -1237,17 +1262,17 @@
"timeline/item/context": [
{
"command": "git.timeline.openDiff",
"group": "1_timeline",
"group": "1_actions",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/"
},
{
"command": "git.timeline.copyCommitId",
"group": "2_timeline@1",
"group": "5_copy@1",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
},
{
"command": "git.timeline.copyCommitMessage",
"group": "2_timeline@2",
"group": "5_copy@2",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
}
]
Expand Down
2 changes: 1 addition & 1 deletion extensions/git/src/timelineProvider.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,6 @@ export class GitTimelineProvider implements TimelineProvider {

@debounce(500)
private fireChanged() {
this._onDidChange.fire({ reset: true });
this._onDidChange.fire(undefined);
}
}
4 changes: 2 additions & 2 deletions extensions/merge-conflict/package.nls.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"command.compare": "Compare Current Conflict",
"config.title": "Merge Conflict",
"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
"config.codeLensEnabled": "Create a CodeLens for merge conflict blocks within editor.",
"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
"config.diffViewPosition.current": "Open the diff view in the current editor group.",
"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
"config.diffViewPosition.below": "Open the diff view below the current editor group."
}
}
2 changes: 1 addition & 1 deletion extensions/python/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "MagicStack/MagicPython",
"repositoryUrl": "https://github.com/MagicStack/MagicPython",
"commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc"
"commitHash": "0b09c1fca238d22e15ac5712d03f9bf6da626f9c"
}
},
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion extensions/python/syntaxes/MagicPython.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/MagicStack/MagicPython/commit/c9b3409deb69acec31bbf7913830e93a046b30cc",
"version": "https://github.com/MagicStack/MagicPython/commit/0b09c1fca238d22e15ac5712d03f9bf6da626f9c",
"name": "MagicPython",
"scopeName": "source.python",
"patterns": [
Expand Down
4 changes: 2 additions & 2 deletions extensions/sql/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"git": {
"name": "Microsoft/vscode-mssql",
"repositoryUrl": "https://github.com/Microsoft/vscode-mssql",
"commitHash": "a79741f76fd33bd137a8c28172c9750b978309b6"
"commitHash": "a542fe96780e6b274adb281810d419a512fb5bb4"
}
},
"license": "MIT",
"version": "1.6.0"
"version": "1.9.0"
}
],
"version": 1
Expand Down
8 changes: 4 additions & 4 deletions extensions/sql/syntaxes/sql.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/vscode-mssql/commit/a79741f76fd33bd137a8c28172c9750b978309b6",
"version": "https://github.com/Microsoft/vscode-mssql/commit/a542fe96780e6b274adb281810d419a512fb5bb4",
"name": "SQL",
"scopeName": "source.sql",
"patterns": [
Expand Down Expand Up @@ -404,7 +404,7 @@
}
},
"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
"match": "(N)?(')[^']*(')",
"match": "(N)?(')(?:[^'\\\\]|\\\\.)*(')",
"name": "string.quoted.single.sql"
},
{
Expand Down Expand Up @@ -437,7 +437,7 @@
}
},
"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
"match": "(`)[^`\\\\]*(`)",
"match": "(`)(?:[^`\\\\]|\\\\.)*(`)",
"name": "string.quoted.other.backtick.sql"
},
{
Expand Down Expand Up @@ -470,7 +470,7 @@
}
},
"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
"match": "(\")[^\"#]*(\")",
"match": "(\")(?:[^\"#\\\\]|\\\\.)*(\")",
"name": "string.quoted.double.sql"
},
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"native-keymap": "2.1.1",
"native-watchdog": "1.3.0",
"ng2-charts": "^1.6.0",
"node-pty": "^0.10.0-beta2",
"node-pty": "0.10.0-beta7",
"onigasm-umd": "2.2.5",
"plotly.js-dist": "^1.48.3",
"reflect-metadata": "^0.1.8",
Expand Down
30 changes: 9 additions & 21 deletions product.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,16 @@
]
},
"extensionAllowedProposedApi": [
"ms-vscode.references-view",
"ms-vsliveshare.vsliveshare",
"ms-vsliveshare.cloudenv",
"ms-vsliveshare.cloudenv-explorer",
"GitHub.vscode-pull-request-github",
"GitHub.vscode-pull-request-github-insiders",
"Microsoft.vscode-nmake-tools",
"ms-vscode-remote.remote-containers",
"ms-vscode-remote.remote-containers-nightly",
"ms-vscode-remote.remote-ssh",
"ms-vscode-remote.remote-ssh-nightly",
"ms-vscode-remote.remote-ssh-edit",
"ms-vscode-remote.remote-ssh-edit-nightly",
"ms-vscode-remote.remote-ssh-explorer",
"ms-vscode-remote.remote-ssh-explorer-nightly",
"ms-vscode-remote.remote-wsl",
"ms-vscode-remote.remote-wsl-nightly",
"ms-vscode-remote.vscode-remote-extensionpack",
"ms-vscode-remote.vscode-remote-extensionpack-nightly",
"ms-azuretools.vscode-docker"
"ms-vscode.references-view"
],
"extensionsGallery": {
"serviceUrl": "https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery.json"
}
},
"builtInExtensions": [
{
"name": "Microsoft.sqlservernotebook",
"version": "0.3.5",
"repo": "https://github.com/Microsoft/azuredatastudio"
}
]
}
2 changes: 1 addition & 1 deletion remote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"minimist": "^1.2.5",
"native-watchdog": "1.3.0",
"ng2-charts": "^1.6.0",
"node-pty": "^0.10.0-beta2",
"node-pty": "0.10.0-beta7",
"onigasm-umd": "2.2.5",
"reflect-metadata": "^0.1.8",
"rxjs": "5.4.0",
Expand Down
8 changes: 4 additions & 4 deletions remote/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,10 @@ node-addon-api@1.6.2:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.6.2.tgz#d8aad9781a5cfc4132cc2fecdbdd982534265217"
integrity sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA==

node-pty@^0.10.0-beta2:
version "0.10.0-beta2"
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta2.tgz#6fd0d2fbbe881869e4e19795a05c557ac958da81"
integrity sha512-IU2lzlPUZ+gKG7pHJjzBHpnuwPTxWGgT3iyQicZfdL7dwLvP5cm00QxavAXCInBmRkOMhvM4aBSKvfzqQnCDBA==
node-pty@0.10.0-beta7:
version "0.10.0-beta7"
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta7.tgz#7e383b2d1fe2f34509b57187f5a9a6ff90c46111"
integrity sha512-oC2VyIz9YaIvv6lWjAPZbUzmhLW1ouFmxOogNRNQrKeUzUi2yM/QRmybs+dW/Mhd3V89Yh61Ml0J5yuWiMIBbw==
dependencies:
nan "^2.14.0"

Expand Down
6 changes: 6 additions & 0 deletions src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ const nodeCachedDataDir = getNodeCachedDir();
// Configure static command line arguments
const argvConfig = configureCommandlineSwitchesSync(args);

// Remove env set by snap https://github.com/microsoft/vscode/issues/85344
if (process.env['SNAP']) {
delete process.env['GDK_PIXBUF_MODULE_FILE'];
delete process.env['GDK_PIXBUF_MODULEDIR'];
}

/**
* Support user defined locale: load it early before app('ready')
* to have more things running in parallel.
Expand Down
Loading

0 comments on commit 1868a7d

Please sign in to comment.