Skip to content

(fix) add compilerOptions.baseUrl if compilerOptions.paths is set #261

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

Closed
wants to merge 2 commits into from
Closed

(fix) add compilerOptions.baseUrl if compilerOptions.paths is set #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44482cd
(fix) add compilerOptions.baseUrl if compilerOptions.paths is set
joelmukuthu Jul 2, 2020
cebf96a
(test) update checks for relative path imports
joelmukuthu Jul 2, 2020
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
1 change: 1 addition & 0 deletions packages/language-server/src/plugins/typescript/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ export function createLanguageService(
// svelte2tsx JSX typings and react's JSX typings.
// This may happen if a node module has (in)directly installed/imported react's types.
if (!configJson.compilerOptions.paths?.react) {
configJson.compilerOptions.baseUrl = configJson.compilerOptions.baseUrl || '.';
configJson.compilerOptions.paths = configJson.compilerOptions.paths || {};
configJson.compilerOptions.paths.react = [
ts.sys.resolvePath(resolve(__dirname, '../../../../public/sink.d.ts')),
Expand Down
10 changes: 5 additions & 5 deletions packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ describe('CompletionProviderImpl', () => {
item!,
);

assert.strictEqual(detail, 'Auto import from ./definitions\nfunction blubb(): boolean');
assert.strictEqual(detail, 'Auto import from definitions\nfunction blubb(): boolean');

assert.strictEqual(
harmonizeNewLines(additionalTextEdits![0]?.newText),
Expand Down Expand Up @@ -249,7 +249,7 @@ describe('CompletionProviderImpl', () => {
item!,
);

assert.strictEqual(detail, 'Auto import from ./definitions\nfunction blubb(): boolean');
assert.strictEqual(detail, 'Auto import from definitions\nfunction blubb(): boolean');

assert.strictEqual(
harmonizeNewLines(additionalTextEdits![0]?.newText),
Expand Down Expand Up @@ -281,7 +281,7 @@ describe('CompletionProviderImpl', () => {
item!,
);

assert.strictEqual(detail, 'Auto import from ./definitions\nfunction blubb(): boolean');
assert.strictEqual(detail, 'Auto import from definitions\nfunction blubb(): boolean');

assert.strictEqual(
harmonizeNewLines(additionalTextEdits![0]?.newText),
Expand Down Expand Up @@ -327,7 +327,7 @@ describe('CompletionProviderImpl', () => {
item!,
);

assert.strictEqual(detail, 'Auto import from ./imported-file.svelte\nclass default');
assert.strictEqual(detail, 'Auto import from imported-file.svelte\nclass default');

assert.strictEqual(
harmonizeNewLines(additionalTextEdits![0]?.newText),
Expand Down Expand Up @@ -362,7 +362,7 @@ describe('CompletionProviderImpl', () => {
item!,
);

assert.strictEqual(detail, 'Auto import from ./imported-file.svelte\nclass default');
assert.strictEqual(detail, 'Auto import from imported-file.svelte\nclass default');

assert.strictEqual(
harmonizeNewLines(additionalTextEdits![0]?.newText),
Expand Down