Skip to content

Commit 1c589bd

Browse files
sandy081sandy081
authored
Merge branch 'master' into customViewUpdate
2 parents fe64656 + f22d298 commit 1c589bd

118 files changed

Lines changed: 1708 additions & 1710 deletions

File tree

Some content is hidden

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

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "7.1.7"
2+
target "6.1.6"
33
runtime "electron"

‎build/azure-pipelines/linux/xvfb.init‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[ "${NETWORKING}" = "no" ] && exit 0
2020

2121
PROG="/usr/bin/Xvfb"
22-
PROG_OPTIONS=":10 -ac"
22+
PROG_OPTIONS=":10 -ac -screen 0 1024x768x24"
2323
PROG_OUTPUT="/tmp/Xvfb.out"
2424

2525
case "$1" in
@@ -50,4 +50,4 @@ case "$1" in
5050
exit 1
5151
esac
5252

53-
exit $RETVAL
53+
exit $RETVAL

‎build/lib/extensions.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const util = require('./util');
2727
const root = path.dirname(path.dirname(__dirname));
2828
const commit = util.getVersion(root);
2929
const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
30+
const product = require('../../product.json');
3031
function fromLocal(extensionPath) {
3132
const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
3233
const input = fs.existsSync(webpackFilename)
@@ -184,8 +185,10 @@ const excludedExtensions = [
184185
'vscode-test-resolver',
185186
'ms-vscode.node-debug',
186187
'ms-vscode.node-debug2',
188+
'ms.vscode.js-debug-nightly'
187189
];
188-
const builtInExtensions = require('../builtInExtensions.json');
190+
const builtInExtensions = require('../builtInExtensions.json')
191+
.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; });
189192
function packageLocalExtensionsStream() {
190193
const localExtensionDescriptions = glob.sync('extensions/*/package.json')
191194
.map(manifestPath => {

‎cgmanifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
9+
"commitHash": "91f08db83c2ce8c722ddf0911ead8f7c473bedfa"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,32 +40,32 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "78.0.3904.130"
43+
"version": "76.0.3809.146"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "nodejs",
5050
"repositoryUrl": "https://github.com/nodejs/node",
51-
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
51+
"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
55-
"version": "12.8.1"
55+
"version": "12.4.0"
5656
},
5757
{
5858
"component": {
5959
"type": "git",
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "bef0dd868b7d6d32716c319664ed480f2ae17396"
63+
"commitHash": "19c705ab80cd6fdccca3d65803ec2c4addb9540a"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "7.1.7"
68+
"version": "6.1.6"
6969
},
7070
{
7171
"component": {

‎extensions/search-result/package.json‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -25,46 +25,6 @@
2525
"editor.lineNumbers": "off"
2626
}
2727
},
28-
"commands": [
29-
{
30-
"command": "searchResult.rerunSearch",
31-
"title": "%searchResult.rerunSearch.title%",
32-
"category": "Search Result",
33-
"icon": {
34-
"light": "./src/media/refresh-light.svg",
35-
"dark": "./src/media/refresh-dark.svg"
36-
}
37-
},
38-
{
39-
"command": "searchResult.rerunSearchWithContext",
40-
"title": "%searchResult.rerunSearchWithContext.title%",
41-
"category": "Search Result",
42-
"icon": {
43-
"light": "./src/media/refresh-light.svg",
44-
"dark": "./src/media/refresh-dark.svg"
45-
}
46-
}
47-
],
48-
"menus": {
49-
"commandPalette": [
50-
{
51-
"command": "searchResult.rerunSearch",
52-
"when": "false"
53-
},
54-
{
55-
"command": "searchResult.rerunSearchWithContext",
56-
"when": "false"
57-
}
58-
],
59-
"editor/title": [
60-
{
61-
"command": "searchResult.rerunSearch",
62-
"when": "editorLangId == search-result",
63-
"alt": "searchResult.rerunSearchWithContext",
64-
"group": "navigation"
65-
}
66-
]
67-
},
6828
"languages": [
6929
{
7030
"id": "search-result",

‎extensions/search-result/package.nls.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
22
"displayName": "Search Result",
3-
"description": "Provides syntax highlighting and language features for tabbed search results.",
4-
"searchResult.rerunSearch.title": "Search Again",
5-
"searchResult.rerunSearchWithContext.title": "Search Again (With Context)"
3+
"description": "Provides syntax highlighting and language features for tabbed search results."
64
}

‎extensions/search-result/src/extension.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ export function activate(context: vscode.ExtensionContext) {
3434
}
3535

3636
context.subscriptions.push(
37-
vscode.commands.registerCommand('searchResult.rerunSearch', () => vscode.commands.executeCommand('search.action.rerunEditorSearch')),
38-
vscode.commands.registerCommand('searchResult.rerunSearchWithContext', () => vscode.commands.executeCommand('search.action.rerunEditorSearchWithContext')),
3937

4038
vscode.languages.registerDocumentSymbolProvider(SEARCH_RESULT_SELECTOR, {
4139
provideDocumentSymbols(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.DocumentSymbol[] {

0 commit comments

Comments
 (0)