Skip to content

Commit

Permalink
Fix untildify
Browse files Browse the repository at this point in the history
  • Loading branch information
rchiodo committed Aug 21, 2024
1 parent 09bfa48 commit f0a2e4b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,7 @@
"tmp": "^0.0.33",
"uint64be": "^3.0.0",
"unicode": "^14.0.0",
"untildify": "^4.0.0",
"untildify": "^5.0.0",
"vscode-debugprotocol": "^1.28.0",
"vscode-jsonrpc": "^9.0.0-next.5",
"vscode-languageclient": "^10.0.0-next.12",
Expand Down
4 changes: 2 additions & 2 deletions src/test/common/configSettings/configSettings.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import * as path from 'path';
import * as sinon from 'sinon';
import * as TypeMoq from 'typemoq';

import untildify = require('untildify');
import { WorkspaceConfiguration } from 'vscode';
import { LanguageServerType } from '../../../client/activation/types';
import { IApplicationEnvironment } from '../../../client/common/application/types';
Expand Down Expand Up @@ -195,8 +194,9 @@ suite('Python Settings', async () => {
.verifiable(TypeMoq.Times.once());

settings.update(config.object);
const untildify = await import('untildify');

expect(settings.condaPath).to.be.equal(untildify(expected.condaPath));
expect(settings.condaPath).to.be.equal(untildify.default(expected.condaPath));
config.verifyAll();
});

Expand Down
5 changes: 3 additions & 2 deletions src/test/common/process/logger.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import * as path from 'path';
import * as sinon from 'sinon';
import * as TypeMoq from 'typemoq';

import untildify = require('untildify');
import { WorkspaceFolder } from 'vscode';
import { IWorkspaceService } from '../../../client/common/application/types';
import { ProcessLogger } from '../../../client/common/process/logger';
Expand All @@ -18,13 +17,15 @@ suite('ProcessLogger suite', () => {
let workspaceService: TypeMoq.IMock<IWorkspaceService>;
let logger: ProcessLogger;
let traceLogStub: sinon.SinonStub;
let untildify: any;

suiteSetup(() => {
suiteSetup(async () => {
workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();
workspaceService
.setup((w) => w.workspaceFolders)
.returns(() => [({ uri: { fsPath: path.join('path', 'to', 'workspace') } } as unknown) as WorkspaceFolder]);
logger = new ProcessLogger(workspaceService.object);
untildify = (await import('untildify')).default;
});

setup(() => {
Expand Down

0 comments on commit f0a2e4b

Please sign in to comment.