Skip to content

Commit bbb6a07

Browse files
authored
Merge branch 'main' into copilot/add-toggle-for-uv-venvs
2 parents 74a408b + d4fcbb0 commit bbb6a07

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ export default [{
3535
eqeqeq: "warn",
3636
"no-throw-literal": "warn",
3737
semi: "warn",
38-
"@typescript-eslint/no-explicit-any": "warn",
38+
"@typescript-eslint/no-explicit-any": "error",
3939
},
4040
}];

examples/sample1/src/api.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,6 @@ export interface PythonProject {
650650
* The tooltip for the Python project, which can be a string or a Markdown string.
651651
*/
652652
readonly tooltip?: string | MarkdownString;
653-
654653
}
655654

656655
/**
@@ -692,7 +691,6 @@ export interface PythonProjectCreator {
692691
*/
693692
readonly tooltip?: string | MarkdownString;
694693

695-
696694
/**
697695
* Creates a new Python project or projects.
698696
* @param options - Optional parameters for creating the Python project.
@@ -1228,12 +1226,13 @@ export interface PythonEnvironmentVariablesApi {
12281226
* 3. `.env` file at the root of the python project.
12291227
* 4. `overrides` in the order provided.
12301228
*
1231-
* @param uri The URI of the project, workspace or a file in a for which environment variables are required.
1229+
* @param uri The URI of the project, workspace or a file in a for which environment variables are required. If not provided,
1230+
* it fetches the environment variables for the global scope.
12321231
* @param overrides Additional environment variables to override the defaults.
12331232
* @param baseEnvVar The base environment variables that should be used as a starting point.
12341233
*/
12351234
getEnvironmentVariables(
1236-
uri: Uri,
1235+
uri: Uri | undefined,
12371236
overrides?: ({ [key: string]: string | undefined } | Uri)[],
12381237
baseEnvVar?: { [key: string]: string | undefined },
12391238
): Promise<{ [key: string]: string | undefined }>;

src/api.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,12 +1237,13 @@ export interface PythonEnvironmentVariablesApi {
12371237
* 3. `.env` file at the root of the python project.
12381238
* 4. `overrides` in the order provided.
12391239
*
1240-
* @param uri The URI of the project, workspace or a file in a for which environment variables are required.
1240+
* @param uri The URI of the project, workspace or a file in a for which environment variables are required.If not provided,
1241+
* it fetches the environment variables for the global scope.
12411242
* @param overrides Additional environment variables to override the defaults.
12421243
* @param baseEnvVar The base environment variables that should be used as a starting point.
12431244
*/
12441245
getEnvironmentVariables(
1245-
uri: Uri,
1246+
uri: Uri | undefined,
12461247
overrides?: ({ [key: string]: string | undefined } | Uri)[],
12471248
baseEnvVar?: { [key: string]: string | undefined },
12481249
): Promise<{ [key: string]: string | undefined }>;

src/test/features/terminalEnvVarInjectorBasic.unit.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ suite('TerminalEnvVarInjector Basic Tests', () => {
4040
};
4141

4242
// Setup environment variable collection to return scoped collection
43-
envVarCollection.setup((x) => x.getScoped(typeMoq.It.isAny())).returns(() => mockScopedCollection as any);
43+
envVarCollection
44+
.setup((x) => x.getScoped(typeMoq.It.isAny()))
45+
.returns(
46+
() => mockScopedCollection as unknown as ReturnType<GlobalEnvironmentVariableCollection['getScoped']>,
47+
);
4448
envVarCollection.setup((x) => x.clear()).returns(() => {});
4549

4650
// Setup minimal mocks for event subscriptions

0 commit comments

Comments
 (0)