Skip to content

Remove hack to check the vscode version #21180

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

Merged
merged 5 commits into from
May 4, 2023
Merged

Remove hack to check the vscode version #21180

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a61704
Remove hack to check the vscode version
paulacamargo25 May 4, 2023
1ae681f
Remove extra character
paulacamargo25 May 4, 2023
c51cc13
Update engine value
paulacamargo25 May 4, 2023
a7af06f
Update package-lock
paulacamargo25 May 4, 2023
cc61e8b
Update function name
paulacamargo25 May 4, 2023
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
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 @@ -44,7 +44,7 @@
"theme": "dark"
},
"engines": {
"vscode": "^1.78.0-20230421"
"vscode": "^1.78.0"
},
"keywords": [
"python",
Expand Down
10 changes: 1 addition & 9 deletions src/test/utils/vscode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ import * as path from 'path';
import * as fs from 'fs-extra';
import { EXTENSION_ROOT_DIR } from '../../client/common/constants';

const insidersVersion = /^\^(\d+\.\d+\.\d+)-(insider|\d{8})$/;

export function getChannel(): string {
Copy link
Member

@Tyriar Tyriar May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this would be better named just version as it could return channel (aka quality which is essentially a dynamic version) as well as the actual version.

if (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL) {
return process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL;
}
const packageJsonPath = path.join(EXTENSION_ROOT_DIR, 'package.json');
if (fs.pathExistsSync(packageJsonPath)) {
const packageJson = fs.readJSONSync(packageJsonPath);
const engineVersion = packageJson.engines.vscode;
if (insidersVersion.test(engineVersion)) {
// Can't pass in the version number for an insiders build;
// https://github.com/microsoft/vscode-test/issues/176
return 'insiders';
}
return engineVersion.replace('^', '');
return packageJson.engines.vscode.replace('^', '');
}
return 'stable';
}