Skip to content

Commit 1659770

Browse files
authored
Merge branch 'main' into tyriar/232656__232658
2 parents 1137cb5 + 4621927 commit 1659770

File tree

172 files changed

+2175
-1547
lines changed

Some content is hidden

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

172 files changed

+2175
-1547
lines changed

.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,11 @@ export async function activate(context: vscode.ExtensionContext) {
8686
}, uri => ctrl.items.get(uri.toString().toLowerCase()));
8787
ctrl.relatedCodeProvider = graph;
8888

89-
context.subscriptions.push(
90-
new FailureTracker(context, folder.uri.fsPath),
91-
fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)),
92-
);
89+
if (context.storageUri) {
90+
context.subscriptions.push(new FailureTracker(context.storageUri.fsPath, folder.uri.fsPath));
91+
}
92+
93+
context.subscriptions.push(fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)));
9394
});
9495

9596
const createRunHandler = (

.vscode/extensions/vscode-selfhost-test-provider/src/failureTracker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export class FailureTracker {
3333
private readonly logFile: string;
3434
private logs?: ITrackedRemediation[];
3535

36-
constructor(context: vscode.ExtensionContext, private readonly rootDir: string) {
37-
this.logFile = join(context.globalStorageUri.fsPath, '.build/vscode-test-failures.json');
36+
constructor(storageLocation: string, private readonly rootDir: string) {
37+
this.logFile = join(storageLocation, '.build/vscode-test-failures.json');
3838
mkdirSync(dirname(this.logFile), { recursive: true });
3939

4040
const oldLogFile = join(rootDir, '.build/vscode-test-failures.json');

build/lib/layersChecker.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/lib/layersChecker.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ const CORE_TYPES = [
6969
'RequestInit',
7070
'Headers',
7171
'Response',
72+
'Body',
73+
'__type',
7274
'__global',
7375
'PerformanceMark',
7476
'PerformanceObserver',

build/lib/stylelint/vscode-known-variables.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,7 @@
821821
"--chat-current-response-min-height",
822822
"--dropdown-padding-bottom",
823823
"--dropdown-padding-top",
824+
"--inline-chat-frame-progress",
824825
"--insert-border-color",
825826
"--last-tab-margin-right",
826827
"--monaco-monospace-font",
@@ -896,4 +897,4 @@
896897
"--widget-color",
897898
"--text-link-decoration"
898899
]
899-
}
900+
}

build/win32/code.iss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ ArchitecturesAllowed={#ArchitecturesAllowed}
3535
ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
3636
WizardStyle=modern
3737

38+
// We've seen an uptick on broken installations from updates which were unable
39+
// to shutdown VS Code. We rely on the fact that the update signals
40+
// that VS Code is ready to be shutdown, so we're good to use `force` here.
41+
CloseApplications=force
42+
3843
#ifdef Sign
3944
SignTool=esrp
4045
#endif

extensions/markdown-language-features/package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/markdown-language-features/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@
773773
"punycode": "^2.3.1",
774774
"vscode-languageclient": "^8.0.2",
775775
"vscode-languageserver-textdocument": "^1.0.11",
776-
"vscode-markdown-languageserver": "^0.5.0-alpha.8",
776+
"vscode-markdown-languageserver": "^0.5.0-alpha.9",
777777
"vscode-uri": "^3.0.3"
778778
},
779779
"devDependencies": {

extensions/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"description": "Dependencies shared by all extensions",
66
"dependencies": {
7-
"typescript": "5.6.3"
7+
"typescript": "^5.7.0-dev.20241030"
88
},
99
"scripts": {
1010
"postinstall": "node ./postinstall.mjs"

0 commit comments

Comments
 (0)