Skip to content

Commit b994219

Browse files
aiday-maraiday-mar
committed
Merge branch 'main' into aiday/changingTheInlineChatBackgroundColor
2 parents d76a632 + bc472a4 commit b994219

File tree

71 files changed

+1959
-589
lines changed

Some content is hidden

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

71 files changed

+1959
-589
lines changed

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,6 @@
148148
],
149149
"application.experimental.rendererProfiling": true,
150150
"editor.experimental.asyncTokenization": true,
151-
"editor.experimental.asyncTokenizationVerification": true
151+
"editor.experimental.asyncTokenizationVerification": true,
152+
"diffEditor.experimental.useVersion2": true,
152153
}

‎build/gulpfile.reh.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ const serverWithWebEntryPoints = [
125125

126126
function getNodeVersion() {
127127
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
128-
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
129-
return target;
128+
const nodeVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
129+
const internalNodeVersion = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
130+
return { nodeVersion, internalNodeVersion };
130131
}
131132

132133
function getNodeChecksum(nodeVersion, platform, arch) {
@@ -156,7 +157,7 @@ function getNodeChecksum(nodeVersion, platform, arch) {
156157
return undefined;
157158
}
158159

159-
const nodeVersion = getNodeVersion();
160+
const { nodeVersion, internalNodeVersion } = getNodeVersion();
160161

161162
BUILD_TARGETS.forEach(({ platform, arch }) => {
162163
gulp.task(task.define(`node-${platform}-${arch}`, () => {
@@ -193,7 +194,7 @@ function nodejs(platform, arch) {
193194
arch = 'x64';
194195
}
195196

196-
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejs.repository}...`);
197+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
197198

198199
const checksumSha256 = getNodeChecksum(nodeVersion, platform, arch);
199200

@@ -205,14 +206,14 @@ function nodejs(platform, arch) {
205206

206207
switch (platform) {
207208
case 'win32':
208-
return (product.nodejs.repository !== 'https://nodejs.org' ?
209-
fetchGithub(product.nodejs.repository, { version: product.nodejs.version, name: `win-${arch}-node.exe`, checksumSha256 }) :
209+
return (product.nodejsRepository !== 'https://nodejs.org' ?
210+
fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `win-${arch}-node.exe`, checksumSha256 }) :
210211
fetchUrls(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org', checksumSha256 }))
211212
.pipe(rename('node.exe'));
212213
case 'darwin':
213214
case 'linux':
214-
return (product.nodejs.repository !== 'https://nodejs.org' ?
215-
fetchGithub(product.nodejs.repository, { version: product.nodejs.version, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
215+
return (product.nodejsRepository !== 'https://nodejs.org' ?
216+
fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
216217
fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
217218
).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
218219
.pipe(filter('**/node'))

‎extensions/git/src/model.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ class ParentRepositoriesManager {
9595
return [...this._repositories.values()];
9696
}
9797

98-
constructor(private readonly globalState: Memento) { }
98+
constructor(private readonly globalState: Memento) {
99+
this.onDidChangeRepositories();
100+
}
99101

100102
addRepository(repository: string): void {
101103
this._repositories.add(repository);
@@ -137,6 +139,10 @@ class UnsafeRepositoriesManager {
137139
return [...this._repositories.keys()];
138140
}
139141

142+
constructor() {
143+
this.onDidChangeRepositories();
144+
}
145+
140146
addRepository(repository: string, path: string): void {
141147
this._repositories.set(repository, path);
142148
this.onDidChangeRepositories();

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.80.0",
4-
"distro": "a44605dbeeed7ad5c41513260004329c4f502793",
4+
"distro": "94a4bd29af2fe03e39c7867fdca1b2e27fed3a39",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -71,7 +71,7 @@
7171
"@vscode/proxy-agent": "^0.13.2",
7272
"@vscode/ripgrep": "^1.15.4",
7373
"@vscode/spdlog": "^0.13.10",
74-
"@vscode/sqlite3": "5.1.4-vscode",
74+
"@vscode/sqlite3": "5.1.5-vscode",
7575
"@vscode/sudo-prompt": "9.3.1",
7676
"@vscode/vscode-languagedetection": "1.0.21",
7777
"@vscode/windows-mutex": "^0.4.4",
@@ -86,7 +86,7 @@
8686
"native-is-elevated": "0.6.0",
8787
"native-keymap": "^3.3.2",
8888
"native-watchdog": "^1.4.1",
89-
"node-pty": "1.0",
89+
"node-pty": "1.1.0-beta1",
9090
"tas-client-umd": "0.1.8",
9191
"v8-inspect-profiler": "^0.1.0",
9292
"vscode-oniguruma": "1.7.0",
@@ -230,4 +230,4 @@
230230
"optionalDependencies": {
231231
"windows-foreground-love": "0.5.0"
232232
}
233-
}
233+
}

‎product.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"linuxIconName": "code-oss",
3131
"licenseFileName": "LICENSE.txt",
3232
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
33+
"nodejsRepository": "https://nodejs.org",
3334
"urlProtocol": "code-oss",
3435
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
3536
"builtInExtensions": [
@@ -81,9 +82,5 @@
8182
"publisherDisplayName": "Microsoft"
8283
}
8384
}
84-
],
85-
"nodejs": {
86-
"repository": "https://nodejs.org",
87-
"version": "16.17.1"
88-
}
85+
]
8986
}

‎remote/.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
disturl "http://nodejs.org/dist"
22
target "16.17.1"
3+
ms_build_id "20230714"
34
runtime "node"
45
build_from_source "true"

‎remote/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"keytar": "7.9.0",
2222
"minimist": "^1.2.6",
2323
"native-watchdog": "^1.4.1",
24-
"node-pty": "1.0",
24+
"node-pty": "1.1.0-beta1",
2525
"tas-client-umd": "0.1.8",
2626
"vscode-oniguruma": "1.7.0",
2727
"vscode-regexpp": "^3.1.0",

‎remote/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,10 +537,10 @@ node-gyp-build@^4.3.0:
537537
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
538538
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
539539

540-
node-pty@1.0:
541-
version "1.0.0"
542-
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.0.0.tgz#7daafc0aca1c4ca3de15c61330373af4af5861fd"
543-
integrity sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==
540+
node-pty@1.1.0-beta1:
541+
version "1.1.0-beta1"
542+
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta1.tgz#95d4baf406c043b78042f951b325e9713df2beac"
543+
integrity sha512-h+1E/gX/brFqsp3yZKGERHOhdo1POG1rrsI+8tEuocqdEddHd029471gq8KOuiHKicd52h2pSU8Gtqb3Vo2PfQ==
544544
dependencies:
545545
nan "^2.17.0"
546546

‎src/vs/base/browser/ui/scrollbar/scrollableElement.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,9 @@ export abstract class AbstractScrollableElement extends Widget {
373373
}
374374

375375
private _onMouseWheel(e: StandardWheelEvent): void {
376+
if (e.browserEvent?.defaultPrevented) {
377+
return;
378+
}
376379

377380
const classifier = MouseWheelClassifier.INSTANCE;
378381
if (SCROLL_WHEEL_SMOOTH_SCROLL_ENABLED) {

‎src/vs/base/test/node/pfs/fixtures/index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@
4141
}
4242
</script>
4343
<script type="text/javascript">
44-
44+
4545
var libText = "";
4646
$.get("../compiler/lib.ts", function(newLibText) {
4747
libText = newLibText;
48-
});
49-
48+
});
49+
5050

5151
// execute the javascript in the compiledOutput pane
5252
function execute() {
5353
$('#compilation').text("Running...");
5454
var txt = $('#compiledOutput').val();
5555
var res;
5656
try {
57-
var ret = eval(txt);
57+
var ret = eval(txt); // CodeQL [SM01632] This code is only used for tests
5858
res = "Ran successfully!";
59-
} catch(e) {
59+
} catch(e) {
6060
res = "Exception thrown: " + e;
6161
}
6262
$('#compilation').text(String(res));
@@ -70,7 +70,7 @@
7070
compiledSource = compile(newText, libText);
7171
} catch (e) {
7272
compiledSource = "//Parse error"
73-
for(var i in e)
73+
for(var i in e)
7474
compiledSource += "\r// " + e[i];
7575
}
7676
$('#compiledOutput').val(compiledSource);
@@ -111,7 +111,7 @@ <h1>TypeScript</h1>
111111
//Compiled code will show up here...
112112
</textarea>
113113
<br />
114-
<button onclick='execute()'/>Run</button>
114+
<button onclick='execute()'/>Run</button>
115115
<div id='compilation'>Press 'run' to execute code...</div>
116116
<div id='results'>...write your results into #results...</div>
117117
</div>

0 commit comments

Comments
 (0)