Skip to content

Commit 08f90ef

Browse files
isidornisidorn
committed
merge master
2 parents 5b06dcc + f886dd4 commit 08f90ef

122 files changed

Lines changed: 1425 additions & 1635 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.

‎.vscode/settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@
4848
}, {
4949
"fileMatch": [ "cglicenses.json" ],
5050
"url": "./.vscode/cglicenses.schema.json"
51-
}]
51+
}
52+
],
53+
"git.ignoreLimitWarning": true
5254
}

‎build/azure-pipelines/linux/continuous-build-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- script: |
33
set -e
44
sudo apt-get update
5-
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
5+
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
66
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
77
sudo chmod +x /etc/init.d/xvfb
88
sudo update-rc.d xvfb defaults

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compil
100100

101101

102102
gulp.task('optimize-index-js', ['optimize-vscode'], () => {
103-
const fullpath = path.join(process.cwd(), 'out-vscode/vs/code/electron-browser/workbench/workbench.js');
103+
const fullpath = path.join(process.cwd(), 'out-vscode/bootstrap-window.js');
104104
const contents = fs.readFileSync(fullpath).toString();
105105
const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
106106
fs.writeFileSync(fullpath, newContents);

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"vscode-ripgrep": "^1.2.5",
5454
"vscode-sqlite3": "4.0.5",
5555
"vscode-textmate": "^4.0.1",
56-
"vscode-xterm": "3.10.0-beta7",
56+
"vscode-xterm": "3.10.0-beta9",
5757
"winreg": "^1.2.4",
5858
"yauzl": "^2.9.1",
5959
"yazl": "^2.4.3"

‎resources/linux/debian/control.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: @@NAME@@
22
Version: @@VERSION@@
33
Section: devel
4-
Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0, libgtk-3-0 (>= 3.10.0), libxss1
4+
Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libsecret-1-0, libgtk-3-0 (>= 3.10.0), libxss1
55
Priority: optional
66
Architecture: @@ARCHITECTURE@@
77
Maintainer: Microsoft Corporation <vscode-linux@microsoft.com>

‎resources/linux/rpm/dependencies.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"libX11.so.6()(64bit)",
2828
"libXss.so.1()(64bit)",
2929
"libXtst.so.6()(64bit)",
30-
"libgconf-2.so.4()(64bit)",
3130
"libgmodule-2.0.so.0()(64bit)",
3231
"librt.so.1()(64bit)",
3332
"libglib-2.0.so.0()(64bit)",
@@ -107,7 +106,6 @@
107106
"libgcc_s.so.1",
108107
"libgcc_s.so.1(GCC_4.0.0)",
109108
"libgcc_s.so.1(GLIBC_2.0)",
110-
"libgconf-2.so.4",
111109
"libgdk-x11-2.0.so.0",
112110
"libgdk_pixbuf-2.0.so.0",
113111
"libgio-2.0.so.0",

‎resources/linux/snap/snapcraft.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ parts:
1616
stage-packages:
1717
- libasound2
1818
- libc++1
19-
- libgconf2-4
2019
- libnotify4
2120
- libnspr4
2221
- libnss3

‎src/tsconfig.strictNullChecks.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@
319319
"./vs/nls.mock.ts",
320320
"./vs/platform/actions/browser/menuItemActionItem.ts",
321321
"./vs/platform/actions/common/actions.ts",
322-
"./vs/platform/actions/common/menu.ts",
323322
"./vs/platform/actions/common/menuService.ts",
324323
"./vs/platform/actions/test/common/menuService.test.ts",
325324
"./vs/platform/backup/common/backup.ts",
@@ -607,7 +606,6 @@
607606
"./vs/workbench/parts/output/common/output.ts",
608607
"./vs/workbench/parts/output/common/outputLinkComputer.ts",
609608
"./vs/workbench/parts/output/common/outputLinkProvider.ts",
610-
"./vs/workbench/parts/performance/electron-browser/stats.ts",
611609
"./vs/workbench/parts/preferences/browser/settingsWidgets.ts",
612610
"./vs/workbench/parts/preferences/common/smartSnippetInserter.ts",
613611
"./vs/workbench/parts/preferences/test/common/smartSnippetInserter.test.ts",
@@ -812,4 +810,4 @@
812810
"exclude": [
813811
"./typings/require-monaco.d.ts"
814812
]
815-
}
813+
}

‎src/vs/base/parts/quickopen/test/browser/quickopen.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ suite('QuickOpen', () => {
3838
model.addEntries([entry1, entry2, entry3]);
3939

4040
const ds = new DataSource(model);
41-
assert.equal(entry1.getId(), ds.getId(null, entry1));
42-
assert.equal(true, ds.hasChildren(null, model));
43-
assert.equal(false, ds.hasChildren(null, entry1));
41+
assert.equal(entry1.getId(), ds.getId(null!, entry1));
42+
assert.equal(true, ds.hasChildren(null!, model));
43+
assert.equal(false, ds.hasChildren(null!, entry1));
4444

45-
ds.getChildren(null, model).then((children: any[]) => {
45+
ds.getChildren(null!, model).then((children: any[]) => {
4646
assert.equal(3, children.length);
4747
});
4848
});

‎src/vs/base/parts/tree/test/browser/treeModel.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class FakeRenderer {
3636

3737
class TreeContext implements _.ITreeContext {
3838

39-
public tree: _.ITree = null;
39+
public tree: _.ITree = null!;
4040
public options: _.ITreeOptions = { autoExpandSingleChildren: true };
4141
public dataSource: _.IDataSource;
4242
public renderer: _.IRenderer;

0 commit comments

Comments
 (0)