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
4 changes: 3 additions & 1 deletion src/services/codefixes/fixCannotFindModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ namespace ts.codefix {
}

function tryGetImportedPackageName(sourceFile: SourceFile, pos: number): string | undefined {
const moduleName = cast(getTokenAtPosition(sourceFile, pos), isStringLiteral).text;
const moduleSpecifierText = tryCast(getTokenAtPosition(sourceFile, pos), isStringLiteral);
if (!moduleSpecifierText) return undefined;
const moduleName = moduleSpecifierText.text;
const { packageName } = parsePackageName(moduleName);
return isExternalModuleNameRelative(packageName) ? undefined : packageName;
}
Expand Down
8 changes: 4 additions & 4 deletions src/services/codefixes/importFixes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,11 @@ namespace ts.codefix {

function getFixesInfoForNonUMDImport({ sourceFile, program, cancellationToken, host, preferences }: CodeFixContextBase, symbolToken: Identifier, useAutoImportProvider: boolean): FixesInfo | undefined {
const checker = program.getTypeChecker();
const symbolName = getSymbolName(sourceFile, checker, symbolToken);
const compilerOptions = program.getCompilerOptions();
const symbolName = getSymbolName(sourceFile, checker, symbolToken, compilerOptions);
// "default" is a keyword and not a legal identifier for the import, so we don't expect it here
Debug.assert(symbolName !== InternalSymbolName.Default, "'default' isn't a legal identifier and couldn't occur here");

const compilerOptions = program.getCompilerOptions();
const preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error && isValidTypeOnlyAliasUseSite(symbolToken);
const useRequire = shouldUseRequire(sourceFile, program);
const exportInfos = getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host);
Expand All @@ -525,9 +525,9 @@ namespace ts.codefix {
return { fixes, symbolName };
}

function getSymbolName(sourceFile: SourceFile, checker: TypeChecker, symbolToken: Identifier): string {
function getSymbolName(sourceFile: SourceFile, checker: TypeChecker, symbolToken: Identifier, compilerOptions: CompilerOptions): string {
const parent = symbolToken.parent;
if ((isJsxOpeningLikeElement(parent) || isJsxClosingElement(parent)) && parent.tagName === symbolToken) {
if ((isJsxOpeningLikeElement(parent) || isJsxClosingElement(parent)) && parent.tagName === symbolToken && compilerOptions.jsx !== JsxEmit.ReactJSX && compilerOptions.jsx !== JsxEmit.ReactJSXDev) {
const jsxNamespace = checker.getJsxNamespace(sourceFile);
if (isIntrinsicJsxName(symbolToken.text) || !checker.resolveName(jsxNamespace, parent, SymbolFlags.Value, /*excludeGlobals*/ true)) {
return jsxNamespace;
Expand Down
43 changes: 43 additions & 0 deletions tests/cases/fourslash/codeFixAddMissingImportForReactJsx1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/// <reference path='fourslash.ts' />

// @jsx: react-jsx

// @Filename: node_modules/react/index.d.ts
////export declare var React: any;

// @Filename: node_modules/react/package.json
////{
//// "name": "react",
//// "types": "./index.d.ts"
////}

// @Filename: foo.tsx
//// export default function Foo(){
//// return <></>;
//// }

// @Filename: bar.tsx
//// export default function Bar(){
//// return <Foo></Foo>;
//// }

// @Filename: package.json
////{
//// "dependencies": {
//// "react": "*"
//// }
////}

goTo.file('bar.tsx')

verify.codeFixAll({
fixId: "fixMissingImport",
fixAllDescription: "Add all missing imports",
newFileContent:
`import Foo from "./foo";

export default function Bar(){
return <Foo></Foo>;
}`,
});

43 changes: 43 additions & 0 deletions tests/cases/fourslash/codeFixAddMissingImportForReactJsx2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/// <reference path='fourslash.ts' />

// @jsx: react-jsxdev

// @Filename: node_modules/react/index.d.ts
////export declare var React: any;

// @Filename: node_modules/react/package.json
////{
//// "name": "react",
//// "types": "./index.d.ts"
////}

// @Filename: foo.tsx
//// export default function Foo(){
//// return <></>;
//// }

// @Filename: bar.tsx
//// export default function Bar(){
//// return <Foo></Foo>;
//// }

// @Filename: package.json
////{
//// "dependencies": {
//// "react": "*"
//// }
////}

goTo.file('bar.tsx')

verify.codeFixAll({
fixId: "fixMissingImport",
fixAllDescription: "Add all missing imports",
newFileContent:
`import Foo from "./foo";

export default function Bar(){
return <Foo></Foo>;
}`,
});