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

Bump vs code version to ^1.59 #754

Merged
merged 1 commit into from
Nov 10, 2021
Merged

Bump vs code version to ^1.59 #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"homepage": "https://scalameta.org/metals/",
"engines": {
"vscode": "^1.43.0"
"vscode": "^1.59.0"
},
"icon": "images/logo.png",
"categories": [
Expand Down Expand Up @@ -782,7 +782,7 @@
"@types/jest": "^27.0.2",
"@types/node": "16.11.7",
"@types/shell-quote": "1.7.1",
"@types/vscode": "1.43.0",
"@types/vscode": "1.59.0",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"eslint": "^7.32.0",
Expand Down
2 changes: 1 addition & 1 deletion src/findinfiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ async function toTopLevel(locations: Location[]): Promise<TopLevel[]> {
class FindInFilesProvider implements TreeDataProvider<Node> {
private items: TopLevel[] = [];

didChange = new EventEmitter<Node>();
didChange = new EventEmitter<Node | undefined>();
onDidChangeTreeData = this.didChange.event;

getTreeItem(element: Node): TreeItem {
Expand Down
14 changes: 6 additions & 8 deletions src/treeview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import * as fs from "fs";
import {
TreeDataProvider,
TreeItem,
Event,
EventEmitter,
TreeItemCollapsibleState,
window,
Expand Down Expand Up @@ -167,8 +166,8 @@ export function startTreeView(
* node children and parents to the Metals server.
*/
class MetalsTreeDataProvider implements TreeDataProvider<string> {
didChange = new EventEmitter<string>();
onDidChangeTreeData?: Event<string> = this.didChange.event;
didChange = new EventEmitter<string | undefined>();
onDidChangeTreeData = this.didChange.event;
items: Map<string, MetalsTreeViewNode> = new Map();
constructor(
readonly client: LanguageClient,
Expand Down Expand Up @@ -246,11 +245,10 @@ class MetalsTreeDataProvider implements TreeDataProvider<string> {
this.icons.set(icon, noTheme);
return noTheme;
} else {
const themed = {
dark: this.joinIcon(icon + "-dark"),
light: this.joinIcon(icon + "-light"),
};
if (themed.dark && themed.light) {
const dark = this.joinIcon(icon + "-dark");
const light = this.joinIcon(icon + "-light");
if (dark && light) {
const themed = { dark, light };
this.icons.set(icon, themed);
return themed;
}
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 @@ -655,10 +655,10 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==

"@types/vscode@1.43.0":
version "1.43.0"
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.43.0.tgz#22276e60034c693b33117f1068ffaac0e89522db"
integrity sha512-kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ==
"@types/vscode@1.59.0":
version "1.59.0"
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.59.0.tgz#11c93f5016926126bf30b47b9ece3bd617eeef31"
integrity sha512-Zg38rusx2nU6gy6QdF7v4iqgxNfxzlBlDhrRCjOiPQp+sfaNrp3f9J6OHIhpGNN1oOAca4+9Hq0+8u3jwzPMlQ==

"@types/yargs-parser@*":
version "20.2.0"
Expand Down