Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 src/harness/harnessIO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ export namespace Compiler {

function fileOutput(file: documents.TextDocument, harnessSettings: TestCaseParser.CompilerSettings): string {
const fileName = harnessSettings.fullEmitPaths ? Utils.removeTestPathPrefixes(file.file) : ts.getBaseFileName(file.file);
return "//// [" + fileName + "]\r\n" + Utils.removeTestPathPrefixes(file.text);
Copy link
Copy Markdown
Member Author

@jakebailey jakebailey Jan 28, 2026

Choose a reason for hiding this comment

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

This was mistakenly changing paths in emitted reference directives, leaving them in a confusingly broken state. See the first commit for examples.

return "//// [" + fileName + "]\r\n" + file.text;
}

export function collateOutputs(outputFiles: readonly documents.TextDocument[]): string {
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/callsOnComplexSignatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var react_1 = __importDefault(require("react"));
// Simple calls from real usecases
function test1() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const testErr = <ResizablePanel>

//// [checkJsxChildrenCanBeTupleType.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
}
};
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
var AsyncLoader = /** @class */ (function (_super) {
__extends(AsyncLoader, _super);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ComponentWithUnion({

//// [checkJsxUnionSFXContextualTypeInferredCorrectly.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function F<T, U>(p1: Stuff<T>, p2: Stuff<U>) {
}

//// [conditionalTypeVarianceBigArrayConstraintsPerformance.js]
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
function F(p1, p2) {
p1 = p2; // Error
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class I<T1 extends keyof JSX.IntrinsicElements, T2 extends keyof JSX.IntrinsicEl
}

//// [errorInfoForRelatedIndexTypesNoConstraintElaboration.js]
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var I = /** @class */ (function () {
function I() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const v1 = <Component onClick={e => e.preventDefault()} />;

//// [genericInferenceDefaultTypeParameterJsxReact.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/ignoredJsxAttributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ let x2 = <Yadda bar="hello" data-yadda={42}/>; // Error

//// [ignoredJsxAttributes.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const ExampleFunctionalComponent = ({ "data-testid": dataTestId, [dynProp
);

//// [jsDeclarationsNonIdentifierInferredNames.js]
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
import * as React from "react";
const dynPropName = "data-dyn";
export const ExampleFunctionalComponent = ({ "data-testid": dataTestId, [dynPropName]: dynProp }) => (React.createElement(React.Fragment, null, "Hello"));
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/jsDeclarationsReactComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" preserve="true" />
/// <reference path="/.lib/react16.d.ts" preserve="true" />
var react_1 = __importDefault(require("react"));
var prop_types_1 = __importDefault(require("prop-types"));
var TabbedShowLayout = function (_a) {
Expand Down Expand Up @@ -185,7 +185,7 @@ exports.default = Tree;


//// [jsDeclarationsReactComponents1.d.ts]
/// <reference path="../..react16.d.ts" preserve="true" />
/// <reference path="../../.lib/react16.d.ts" preserve="true" />
export default TabbedShowLayout;
declare function TabbedShowLayout({}: {}): JSX.Element;
declare namespace TabbedShowLayout {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const Hoc = <Tag extends Tags>(

//// [jsxCallElaborationCheckNoCrash1.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/jsxChildWrongType.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const a = (

//// [index.js]
"use strict";
/// <reference path="react18/react18.d.ts" />
/// <reference path="react18/global.d.ts" />
/// <reference path="/.lib/react18/react18.d.ts" />
/// <reference path="/.lib/react18/global.d.ts" />
const a = (React.createElement("main", null,
(React.createElement("div", null)),
React.createElement("span", null)));
4 changes: 2 additions & 2 deletions tests/baselines/reference/jsxChildrenArrayWrongType.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const b = (

//// [index.js]
"use strict";
/// <reference path="react18/react18.d.ts" />
/// <reference path="react18/global.d.ts" />
/// <reference path="/.lib/react18/react18.d.ts" />
/// <reference path="/.lib/react18/global.d.ts" />
var b = (React.createElement(Foo, null,
React.createElement("div", null),
"aa"));
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.Blah = Blah;
exports.Blah2 = Blah2;
exports.Blah3 = Blah3;
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
function Blah(props) {
return React.createElement(React.Fragment, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class App extends React.Component<{}> {

//// [jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/jsxChildrenWrongType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const b = (

//// [other.js]
"use strict";
/// <reference path="react18/react18.d.ts" />
/// <reference path="react18/global.d.ts" />
/// <reference path="/.lib/react18/react18.d.ts" />
/// <reference path="/.lib/react18/global.d.ts" />
const b = (React.createElement(Foo, null,
React.createElement("div", null),
"aa"));
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea

//// [jsxComplexSignatureHasApplicabilityError.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default Foo;


//// [jsxDeclarationsWithEsModuleInteropNoCrash.d.ts]
/// <reference path="..react16.d.ts" preserve="true" />
/// <reference path="../.lib/react16.d.ts" preserve="true" />
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This was broken before due to an overzealous replacement.

export default Foo;
declare function Foo({ bar }: {
bar: any;
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/jsxElementType.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
}
};
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
var Component;
var RenderElement = function (_a) {
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/jsxElementTypeLiteral.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var __importStar = (this && this.__importStar) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
// should be fine - `ElementType` accepts `div`
var a = React.createElement("div", null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var __importStar = (this && this.__importStar) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
// should be fine - `ElementType` accepts `div`
var a = React.createElement("div", null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var __importStar = (this && this.__importStar) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
function Wrapper(props) {
return React.createElement("div", null, props.children);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const myHoc = <ComposedComponentProps extends any>(

//// [jsxExcessPropsAndAssignability.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ return <>
}

//// [jsxFragReactReferenceErrors.jsx]
/// <reference path="react18/react18.d.ts" />
/// <reference path="react18/global.d.ts" />
/// <reference path="/.lib/react18/react18.d.ts" />
/// <reference path="/.lib/react18/global.d.ts" />
export function Component() {
return <>
</>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ return <>
}

//// [jsxFragReactReferenceErrors.js]
/// <reference path="react18/react18.d.ts" />
/// <reference path="react18/global.d.ts" />
/// <reference path="/.lib/react18/react18.d.ts" />
/// <reference path="/.lib/react18/global.d.ts" />
export function Component() {
return <>
</>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function Counter({ count = 0 }: CounterProps) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.Counter = Counter;
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var react_1 = require("react");
function Counter(_a) {
var _b = _a.count, count = _b === void 0 ? 0 : _b;
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/jsxFragmentWrongType.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const jsxWithReactFragment = <React.Fragment>{test}</React.Fragment>;

//// [a.js]
"use strict";
/// <reference path="react18/react18.d.ts" />
/// <reference path="react18/global.d.ts" />
/// <reference path="/.lib/react18/react18.d.ts" />
/// <reference path="/.lib/react18/global.d.ts" />
const test = () => "asd";
const jsxWithJsxFragment = React.createElement(React.Fragment, null, test);
const jsxWithReactFragment = React.createElement(React.Fragment, null, test);
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var __importStar = (this && this.__importStar) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
require("./App.css"); // doesn't actually exist
var tag = React.createElement("div", null);
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var __importStar = (this && this.__importStar) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
function SomeComponent(props) {
// Just so the return value is RectElement, the rendered element doesnt matter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var __importStar = (this && this.__importStar) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var React = __importStar(require("react"));
// opening + closing
var a = React.createElement("div", null); // empty type args
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/jsxIntrinsicUnions.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const tag = <El className="ok" key="key">{"Title"}</El>;

//// [jsxIntrinsicUnions.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const d = <MyTagWithOptionalNonJSXBits x={2} />; // Technically OK, but probably

//// [jsxIssuesErrorWhenTagExpectsTooManyArguments.js]
"use strict";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export {};
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_runtime_1 = require("react/jsx-runtime");
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var a = (0, jsx_runtime_1.jsx)("div", { children: "text" });
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ export {};
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
var _jsxFileName = "jsxJsxsCjsTransformChildren.tsx";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var a = (0, jsx_dev_runtime_1.jsxDEV)("div", { children: "text" }, void 0, false, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ export {};
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_runtime_1 = require("preact/jsx-runtime");
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ export {};
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
var _jsxFileName = "jsxJsxsCjsTransformCustomImport.tsx";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ export {};
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_runtime_1 = require("preact/jsx-runtime");
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
/* @jsxImportSource preact */
var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
//// [react.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_runtime_1 = require("react/jsx-runtime");
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
/* @jsxImportSource react */
require("./preact");
var a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ export {};
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
var _jsxFileName = "preact.tsx";
/// <reference path="react16.d.ts" />
var _jsxFileName = "/.src/preact.tsx";
/// <reference path="/.lib/react16.d.ts" />
/* @jsxImportSource preact */
var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 6, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
//// [react.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
var _jsxFileName = "react.tsx";
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
/* @jsxImportSource react */
require("./preact");
var a = (0, jsx_dev_runtime_1.jsxDEV)(jsx_dev_runtime_1.Fragment, { children: [(0, jsx_dev_runtime_1.jsxDEV)("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this), "text", (0, jsx_dev_runtime_1.jsxDEV)("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 7, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var __assign = (this && this.__assign) || function () {
Object.defineProperty(exports, "__esModule", { value: true });
var react_1 = require("react");
var jsx_runtime_1 = require("react/jsx-runtime");
/// <reference path="react16.d.ts" />
/// <reference path="/.lib/react16.d.ts" />
var props = { answer: 42 };
var a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
var b = (0, react_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
Loading