Skip to content

Commit dd0d83d

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 70d8d8a + 090c918 commit dd0d83d

File tree

4 files changed

+26
-8
lines changed

4 files changed

+26
-8
lines changed

client/src/extension.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/no-var-requires */
21
/* --------------------------------------------------------------------------------------------
32
* Copyright (c) Microsoft Corporation. All rights reserved.
43
* Licensed under the MIT License. See License.txt in the project root for license information.
@@ -42,7 +41,7 @@ function findNushellExecutable(): string | null {
4241

4342
// Fall back to searching PATH for 'nu'
4443
return which.sync('nu', { nothrow: true });
45-
} catch (error) {
44+
} catch {
4645
return null;
4746
}
4847
}
@@ -184,6 +183,8 @@ export function activate(context: vscode.ExtensionContext) {
184183
provideTerminalProfile(
185184
token: vscode.CancellationToken,
186185
): vscode.ProviderResult<vscode.TerminalProfile> {
186+
// Consume token to satisfy no-unused-vars without changing behavior
187+
void token;
187188
if (found_nushell_path == null) {
188189
console.log(
189190
'Nushell not found in env:PATH or any of the heuristic locations.',

eslint.config.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module.exports = [
2+
{
3+
files: ['**/*.ts'], // Apply to all TypeScript files
4+
languageOptions: {
5+
parser: require('@typescript-eslint/parser'), // Use TypeScript parser
6+
sourceType: 'module',
7+
},
8+
plugins: {
9+
'@typescript-eslint': require('@typescript-eslint/eslint-plugin'),
10+
},
11+
rules: {
12+
// Add your preferred rules here, or start with recommended
13+
'@typescript-eslint/no-unused-vars': 'warn',
14+
// Add more rules as needed
15+
},
16+
},
17+
];

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@
173173
"@types/node": "24.3.0",
174174
"@types/tmp": "0.2.6",
175175
"@types/vscode": "^1.93.0",
176-
"@typescript-eslint/eslint-plugin": "8.42.0",
177-
"@typescript-eslint/parser": "8.42.0",
176+
"@typescript-eslint/eslint-plugin": "^8.42.0",
177+
"@typescript-eslint/parser": "^8.42.0",
178178
"@vscode/vsce": "3.6.0",
179179
"esbuild": "0.25.9",
180-
"eslint": "9.34.0",
180+
"eslint": "^9.34.0",
181181
"mocha": "11.7.2",
182182
"prettier": "3.6.2",
183183
"ts-loader": "9.5.4",

0 commit comments

Comments
 (0)