Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@typescript-eslint/no-var-requires": "off",

// Other rules
"class-methods-use-this": ["error", {"exceptMethods": ["dispose"]}],
"class-methods-use-this": ["error", { "exceptMethods": ["dispose"] }],
"func-names": "off",
"import/extensions": "off",
"import/namespace": "off",
Expand Down
1,892 changes: 944 additions & 948 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@
"minimatch": "^5.0.1",
"named-js-regexp": "^1.3.3",
"node-stream-zip": "^1.6.0",
"reflect-metadata": "^0.1.12",
"reflect-metadata": "^0.2.2",
"rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4",
"semver": "^7.5.2",
Expand Down Expand Up @@ -1576,9 +1576,9 @@
"cross-spawn": "^6.0.5",
"del": "^6.0.0",
"download": "^8.0.0",
"eslint": "^7.2.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-no-only-tests": "^3.3.0",
"eslint-plugin-react": "^7.20.3",
Expand Down
2 changes: 1 addition & 1 deletion src/client/common/pipes/namedPipes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class CombinedReader implements rpc.MessageReader {

private _onPartialMessage = new rpc.Emitter<rpc.PartialMessageInfo>();

// eslint-disable-next-line @typescript-eslint/no-empty-function
// eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-empty-function
private _callback: rpc.DataCallback = () => {};

private _disposables: rpc.Disposable[] = [];
Expand Down
2 changes: 1 addition & 1 deletion src/client/interpreter/activation/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,9 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
return undefined;
}

// eslint-disable-next-line class-methods-use-this
@traceDecoratorError('Failed to parse Environment variables')
@traceDecoratorVerbose('parseEnvironmentOutput', TraceOptions.None)
// eslint-disable-next-line class-methods-use-this
private parseEnvironmentOutput(output: string, parse: (out: string) => NodeJS.ProcessEnv | undefined) {
if (output.indexOf(ENVIRONMENT_PREFIX) === -1) {
return parse(output);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ export class ActiveState {

private static readonly defaultStateCommand: string = 'state';

@cache(30_000, true, 10_000)
// eslint-disable-next-line class-methods-use-this
@cache(30_000, true, 10_000)
private async getProjectsCached(): Promise<ProjectInfo[] | undefined> {
try {
const stateCommand =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export class CondaService implements ICondaService {
/**
* Return the path to the "conda file".
*/

// eslint-disable-next-line class-methods-use-this
public async getCondaFile(forShellExecution?: boolean): Promise<string> {
return Conda.getConda().then((conda) => {
Expand Down Expand Up @@ -142,8 +143,9 @@ export class CondaService implements ICondaService {
* Return the info reported by the conda install.
* The result is cached for 30s.
*/
@cache(60_000)

// eslint-disable-next-line class-methods-use-this
@cache(60_000)
public async getCondaInfo(): Promise<CondaInfo | undefined> {
const conda = await Conda.getConda();
return conda?.getInfo();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,9 @@ export class Pixi {
*
* @param envDir The root directory (or prefix) of a conda environment
*/
@cache(5_000, true, 10_000)

// eslint-disable-next-line class-methods-use-this
@cache(5_000, true, 10_000)
async getPixiEnvironmentMetadata(envDir: string): Promise<PixiEnvMetadata | undefined> {
const pixiPath = path.join(envDir, 'conda-meta/pixi');
try {
Expand Down
Loading