Skip to content

Commit 8d590d5

Browse files
author
David Sheldrick
committed
rename preserveWithJsExtension to react-native
1 parent 7879b22 commit 8d590d5

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

lib/protocol.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,10 +1798,10 @@ declare namespace ts.server.protocol {
17981798
namespace JsxEmit {
17991799
type None = "None";
18001800
type Preserve = "Preserve";
1801-
type PreserveWithJsExtension = "PreserveWithJsExtension";
1801+
type ReactNative = "ReactNative";
18021802
type React = "React";
18031803
}
1804-
type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React | JsxEmit.PreserveWithJsExtension;
1804+
type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React | JsxEmit.ReactNative;
18051805
namespace ModuleKind {
18061806
type None = "None";
18071807
type CommonJS = "CommonJS";

src/compiler/commandLineParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ namespace ts {
6767
name: "jsx",
6868
type: createMapFromTemplate({
6969
"preserve": JsxEmit.Preserve,
70-
"preservewithjsextension": JsxEmit.PreserveWithJsExtension,
70+
"react-native": JsxEmit.ReactNative,
7171
"react": JsxEmit.React
7272
}),
7373
paramType: Diagnostics.KIND,
74-
description: Diagnostics.Specify_JSX_code_generation_Colon_preserve_preserveWithJsExtension_or_react,
74+
description: Diagnostics.Specify_JSX_code_generation_Colon_preserve_react_native_or_react,
7575
},
7676
{
7777
name: "reactNamespace",

src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@
27132713
"category": "Message",
27142714
"code": 6079
27152715
},
2716-
"Specify JSX code generation: 'preserve', 'preserveWithJsExtension', or 'react'": {
2716+
"Specify JSX code generation: 'preserve', 'react-native', or 'react'": {
27172717
"category": "Message",
27182718
"code": 6080
27192719
},

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3299,7 +3299,7 @@
32993299
None = 0,
33003300
Preserve = 1,
33013301
React = 2,
3302-
PreserveWithJsExtension = 3
3302+
ReactNative = 3
33033303
}
33043304

33053305
export const enum NewLineKind {

src/harness/unittests/commandLineParsing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace ts {
8787
start: undefined,
8888
length: undefined,
8989
}, {
90-
messageText: "Argument for '--jsx' option must be: 'preserve', 'preservewithjsextension', 'react'",
90+
messageText: "Argument for '--jsx' option must be: 'preserve', 'react-native', 'react'",
9191
category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
9292
code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
9393

src/harness/unittests/convertCompilerOptionsFromJson.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ namespace ts {
9494
file: undefined,
9595
start: 0,
9696
length: 0,
97-
messageText: "Argument for '--jsx' option must be: 'preserve', 'preservewithjsextension', 'react'",
97+
messageText: "Argument for '--jsx' option must be: 'preserve', 'react-native', 'react'",
9898
code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
9999
category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
100100
}]

src/harness/unittests/matchFiles.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -909,16 +909,16 @@ namespace ts {
909909
const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveMixedExtensionHost, caseInsensitiveBasePath);
910910
assertParsed(actual, expected);
911911
});
912-
it("with jsx=preserveWithJsExtension, allowJs=false", () => {
912+
it("with jsx=react-native, allowJs=false", () => {
913913
const json = {
914914
compilerOptions: {
915-
jsx: "preserveWithJsExtension",
915+
jsx: "react-native",
916916
allowJs: false
917917
}
918918
};
919919
const expected: ts.ParsedCommandLine = {
920920
options: {
921-
jsx: ts.JsxEmit.PreserveWithJsExtension,
921+
jsx: ts.JsxEmit.ReactNative,
922922
allowJs: false
923923
},
924924
errors: [],
@@ -986,16 +986,16 @@ namespace ts {
986986
const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveMixedExtensionHost, caseInsensitiveBasePath);
987987
assertParsed(actual, expected);
988988
});
989-
it("with jsx=preserveWithJsExtension, allowJs=true", () => {
989+
it("with jsx=react-native, allowJs=true", () => {
990990
const json = {
991991
compilerOptions: {
992-
jsx: "preserveWithJsExtension",
992+
jsx: "react-native",
993993
allowJs: true
994994
}
995995
};
996996
const expected: ts.ParsedCommandLine = {
997997
options: {
998-
jsx: ts.JsxEmit.PreserveWithJsExtension,
998+
jsx: ts.JsxEmit.ReactNative,
999999
allowJs: true
10001000
},
10011001
errors: [],

src/server/protocol.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,11 +2272,11 @@ namespace ts.server.protocol {
22722272
export namespace JsxEmit {
22732273
export type None = "None";
22742274
export type Preserve = "Preserve";
2275-
export type PreserveWithJsExtension = "PreserveWithJsExtension";
2275+
export type ReactNative = "ReactNative";
22762276
export type React = "React";
22772277
}
22782278

2279-
export type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React | JsxEmit.PreserveWithJsExtension;
2279+
export type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React | JsxEmit.ReactNative;
22802280

22812281
export namespace ModuleKind {
22822282
export type None = "None";

tests/cases/fourslash/getEmitOutputTsxFile_PreserveWithJsExtension.ts renamed to tests/cases/fourslash/getEmitOutputTsxFile_ReactNative.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/// <reference path="fourslash.ts" />
22

3-
// @BaselineFile: getEmitOutputTsxFile_PreserveWithJsExtension.baseline
3+
// @BaselineFile: getEmitOutputTsxFile_ReactNative.baseline
44
// @declaration: true
55
// @sourceMap: true
6-
// @jsx: preserveWithJsExtension
6+
// @jsx: react-native
77

88
// @Filename: inputFile1.ts
99
// @emitThisFile: true

tests/cases/unittests/matchFiles.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -898,16 +898,16 @@ namespace ts {
898898
assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
899899
assert.deepEqual(actual.errors, expected.errors);
900900
});
901-
it("with jsx=preserveWithJsExtension, allowJs=false", () => {
901+
it("with jsx=react-native, allowJs=false", () => {
902902
const json = {
903903
compilerOptions: {
904-
jsx: "preserveWithJsExtension",
904+
jsx: "react-native",
905905
allowJs: false
906906
}
907907
};
908908
const expected: ts.ParsedCommandLine = {
909909
options: {
910-
jsx: ts.JsxEmit.PreserveWithJsExtension,
910+
jsx: ts.JsxEmit.ReactNative,
911911
allowJs: false
912912
},
913913
errors: [],
@@ -981,16 +981,16 @@ namespace ts {
981981
assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
982982
assert.deepEqual(actual.errors, expected.errors);
983983
});
984-
it("with jsx=preserveWithJsExtension, allowJs=true", () => {
984+
it("with jsx=react-native, allowJs=true", () => {
985985
const json = {
986986
compilerOptions: {
987-
jsx: "preserveWithJsExtension",
987+
jsx: "react-native",
988988
allowJs: true
989989
}
990990
};
991991
const expected: ts.ParsedCommandLine = {
992992
options: {
993-
jsx: ts.JsxEmit.PreserveWithJsExtension,
993+
jsx: ts.JsxEmit.ReactNative,
994994
allowJs: true
995995
},
996996
errors: [],

0 commit comments

Comments
 (0)