Skip to content

Commit 121ba73

Browse files
committed
2.5.0
1 parent 3301b59 commit 121ba73

File tree

6 files changed

+920
-916
lines changed

6 files changed

+920
-916
lines changed

.prettierrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"printWidth": 120
3+
}

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
33
This project tries to adhere to [Semantic Versioning](http://semver.org/).
44

55

6+
## 2.5.0 - 2023-08-12
7+
### Changed
8+
- Updated Ungit to 1.5.24
9+
- Updated VSCode requirement to ^1.75.0
10+
11+
612
## 2.4.0 - 2022-10-29
713
### Changed
814
- Updated Ungit to 1.5.21

package.json

+9-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Ungit",
44
"description": "Ungit in Visual Studio Code.",
55
"icon": "images/logo.png",
6-
"version": "2.4.0",
6+
"version": "2.5.0",
77
"publisher": "Hirse",
88
"galleryBanner": {
99
"color": "#252833",
@@ -25,12 +25,9 @@
2525
"multi-root ready"
2626
],
2727
"engines": {
28-
"vscode": "^1.72.0"
28+
"vscode": "^1.75.0"
2929
},
3030
"main": "./out/src/extension",
31-
"activationEvents": [
32-
"onCommand:extension.ungit"
33-
],
3431
"contributes": {
3532
"configuration": {
3633
"title": "Ungit",
@@ -80,23 +77,20 @@
8077
"build": "tsc",
8178
"compile": "tsc -watch",
8279
"package": "vsce package",
83-
"postinstall": "patch-package",
8480
"publish": "vsce publish",
8581
"test": "eslint src/*"
8682
},
8783
"dependencies": {
88-
"ungit": "1.5.21",
89-
"vscode-extension-telemetry": "0.1.2"
84+
"ungit": "1.5.24",
85+
"vscode-extension-telemetry": "0.4.5"
9086
},
9187
"devDependencies": {
9288
"@types/node": "16.x.x",
93-
"@types/vscode": "1.72.x",
94-
"@typescript-eslint/eslint-plugin": "5.x.x",
95-
"@typescript-eslint/parser": "5.x.x",
89+
"@types/vscode": "1.75.x",
90+
"@typescript-eslint/eslint-plugin": "6.x.x",
91+
"@typescript-eslint/parser": "6.x.x",
92+
"@vscode/vsce": "^2.20.x",
9693
"eslint": "8.x.x",
97-
"patch-package": "6.x.x",
98-
"postinstall-postinstall": "2.x.x",
99-
"typescript": "4.8.x",
100-
"vsce": "2.13.x"
94+
"typescript": "5.1.x"
10195
}
10296
}

patches/ungit+1.5.21.patch

-19
This file was deleted.

src/extension.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ function getWebViewHTML(uri: Uri, title: string): string {
5555
*/
5656
function executeCommand(): void {
5757
telemetryReporter.sendTelemetryEvent("extension.ungit");
58-
const activeTextEditor = window.activeTextEditor;
5958
let workspaceFolderPromise: Thenable<WorkspaceFolder | undefined>;
60-
if (activeTextEditor && activeTextEditor.document.uri.scheme === "file") {
61-
workspaceFolderPromise = Promise.resolve(workspace.getWorkspaceFolder(activeTextEditor.document.uri));
62-
} else if (workspace.workspaceFolders && workspace.workspaceFolders.length === 1) {
59+
if (window.activeTextEditor?.document.uri.scheme === "file") {
60+
workspaceFolderPromise = Promise.resolve(workspace.getWorkspaceFolder(window.activeTextEditor.document.uri));
61+
} else if (workspace.workspaceFolders?.length === 1) {
6362
workspaceFolderPromise = Promise.resolve(workspace.workspaceFolders[0]);
6463
} else {
6564
workspaceFolderPromise = window.showWorkspaceFolderPick();

0 commit comments

Comments
 (0)