Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pick up latest TS for building VS Code #170890

Merged
merged 2 commits into from
Jan 9, 2023
Merged

Pick up latest TS for building VS Code #170890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12243df
Pick up latest TS for building VS Code
mjbvz Jan 9, 2023
516c7ad
Merge branch 'main' into controlled-woodpecker
mjbvz Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"ts-loader": "^9.2.7",
"ts-node": "^10.9.1",
"tsec": "0.1.4",
"typescript": "^5.0.0-dev.20221214",
"typescript": "^5.0.0-dev.20230109",
"typescript-formatter": "7.1.0",
"underscore": "^1.12.1",
"util": "^0.12.4",
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
listInactiveFocusOutline: notebookEditorBackground,
},
accessibilityProvider: {
getAriaLabel: (element) => {
getAriaLabel: (element: CellViewModel) => {
if (!this.viewModel) {
return '';
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class ListTopCellToolbar extends Disposable {
shouldForwardArgs: true
},
toolbarOptions: {
primaryGroup: g => /^inline/.test(g),
primaryGroup: (g: string) => /^inline/.test(g),
},
hiddenItemStrategy: HiddenItemStrategy.Ignore,
}));
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/search/browser/searchResultsView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export class FolderMatchRenderer extends Disposable implements ICompressibleTree
},
hiddenItemStrategy: HiddenItemStrategy.Ignore,
toolbarOptions: {
primaryGroup: g => /^inline/.test(g),
primaryGroup: (g: string) => /^inline/.test(g),
},
}));

Expand Down Expand Up @@ -220,7 +220,7 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
},
hiddenItemStrategy: HiddenItemStrategy.Ignore,
toolbarOptions: {
primaryGroup: g => /^inline/.test(g),
primaryGroup: (g: string) => /^inline/.test(g),
},
}));

Expand Down Expand Up @@ -299,7 +299,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
},
hiddenItemStrategy: HiddenItemStrategy.Ignore,
toolbarOptions: {
primaryGroup: g => /^inline/.test(g),
primaryGroup: (g: string) => /^inline/.test(g),
},
}));

Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/terminal/test/browser/links/terminalLocalLinkDetector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
remoteAuthority: undefined,
userHome: 'C:\\Home',
backend: {
async getWslPath(original, direction) {
async getWslPath(original: string, direction: 'unix-to-win' | 'win-to-unix') {
if (direction === 'unix-to-win') {
return wslUnixToWindowsPathMap.get(original) ?? original;
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10868,10 +10868,10 @@ typescript@^4.7.4:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==

typescript@^5.0.0-dev.20221214:
version "5.0.0-dev.20221214"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.0-dev.20221214.tgz#848b3bf9406a764a2d2105bcee0ecb7089189263"
integrity sha512-sg2HlS57Zxo1AbNpq+lUY9yHR3qA8DmP2nS8KBkvGO86PXCYtWYxkPhbwV8KtAlU50GNmj20fEVJK7kxvZdXfw==
typescript@^5.0.0-dev.20230109:
version "5.0.0-dev.20230109"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.0-dev.20230109.tgz#318e60a058a81329bc3e332d279cd3b117101aa1"
integrity sha512-tS4gkJVPBUVHIc8+LtfSv3TuaJR/mpvJ9XpLTKSRlPJlhM3rCizt5jCBZLsmNdyuT5LnfsKpswMYtEGUHMdGQA==

typical@^4.0.0:
version "4.0.0"
Expand Down