Skip to content

Commit 1136d5a

Browse files
a-tarasyuka-tarasyuk
committed
fix imports
1 parent eb6aaf3 commit 1136d5a

File tree

5 files changed

+163
-167
lines changed

5 files changed

+163
-167
lines changed

‎src/compiler/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import {
7676
tokenIsIdentifierOrKeywordOrGreaterThan,
7777
tokenToString,
7878
} from "./scanner";
79-
import { textToKeywordObj } from "./scannerUtilities";
79+
import { textToKeywordObj } from "./scannerKeywords";
8080
import { tracing } from "./tracing";
8181
import {
8282
AccessorDeclaration,

‎src/compiler/scanner.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ import {
1111
} from "./core";
1212
import { Debug } from "./debug";
1313
import { Diagnostics } from "./diagnosticInformationMap.generated";
14+
import { textToKeyword, textToToken } from "./scannerKeywords";
1415
import {
1516
parsePseudoBigInt,
1617
positionIsSynthesized,
17-
textToKeyword,
18-
textToToken,
1918
} from "./scannerUtilities";
2019
import {
2120
CharacterCodes,

‎src/compiler/scannerKeywords.ts

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
import { getEntries } from "./core";
2+
import { MapLike } from "./corePublic";
3+
import {
4+
KeywordSyntaxKind,
5+
SyntaxKind,
6+
} from "./types";
7+
8+
export const textToKeywordObj: MapLike<KeywordSyntaxKind> = {
9+
abstract: SyntaxKind.AbstractKeyword,
10+
accessor: SyntaxKind.AccessorKeyword,
11+
any: SyntaxKind.AnyKeyword,
12+
as: SyntaxKind.AsKeyword,
13+
asserts: SyntaxKind.AssertsKeyword,
14+
assert: SyntaxKind.AssertKeyword,
15+
bigint: SyntaxKind.BigIntKeyword,
16+
boolean: SyntaxKind.BooleanKeyword,
17+
break: SyntaxKind.BreakKeyword,
18+
case: SyntaxKind.CaseKeyword,
19+
catch: SyntaxKind.CatchKeyword,
20+
class: SyntaxKind.ClassKeyword,
21+
continue: SyntaxKind.ContinueKeyword,
22+
const: SyntaxKind.ConstKeyword,
23+
["" + "constructor"]: SyntaxKind.ConstructorKeyword,
24+
debugger: SyntaxKind.DebuggerKeyword,
25+
declare: SyntaxKind.DeclareKeyword,
26+
default: SyntaxKind.DefaultKeyword,
27+
delete: SyntaxKind.DeleteKeyword,
28+
do: SyntaxKind.DoKeyword,
29+
else: SyntaxKind.ElseKeyword,
30+
enum: SyntaxKind.EnumKeyword,
31+
export: SyntaxKind.ExportKeyword,
32+
extends: SyntaxKind.ExtendsKeyword,
33+
false: SyntaxKind.FalseKeyword,
34+
finally: SyntaxKind.FinallyKeyword,
35+
for: SyntaxKind.ForKeyword,
36+
from: SyntaxKind.FromKeyword,
37+
function: SyntaxKind.FunctionKeyword,
38+
get: SyntaxKind.GetKeyword,
39+
if: SyntaxKind.IfKeyword,
40+
implements: SyntaxKind.ImplementsKeyword,
41+
import: SyntaxKind.ImportKeyword,
42+
in: SyntaxKind.InKeyword,
43+
infer: SyntaxKind.InferKeyword,
44+
instanceof: SyntaxKind.InstanceOfKeyword,
45+
interface: SyntaxKind.InterfaceKeyword,
46+
intrinsic: SyntaxKind.IntrinsicKeyword,
47+
is: SyntaxKind.IsKeyword,
48+
keyof: SyntaxKind.KeyOfKeyword,
49+
let: SyntaxKind.LetKeyword,
50+
module: SyntaxKind.ModuleKeyword,
51+
namespace: SyntaxKind.NamespaceKeyword,
52+
never: SyntaxKind.NeverKeyword,
53+
new: SyntaxKind.NewKeyword,
54+
null: SyntaxKind.NullKeyword,
55+
number: SyntaxKind.NumberKeyword,
56+
object: SyntaxKind.ObjectKeyword,
57+
package: SyntaxKind.PackageKeyword,
58+
private: SyntaxKind.PrivateKeyword,
59+
protected: SyntaxKind.ProtectedKeyword,
60+
public: SyntaxKind.PublicKeyword,
61+
override: SyntaxKind.OverrideKeyword,
62+
out: SyntaxKind.OutKeyword,
63+
readonly: SyntaxKind.ReadonlyKeyword,
64+
require: SyntaxKind.RequireKeyword,
65+
global: SyntaxKind.GlobalKeyword,
66+
return: SyntaxKind.ReturnKeyword,
67+
satisfies: SyntaxKind.SatisfiesKeyword,
68+
set: SyntaxKind.SetKeyword,
69+
static: SyntaxKind.StaticKeyword,
70+
string: SyntaxKind.StringKeyword,
71+
super: SyntaxKind.SuperKeyword,
72+
switch: SyntaxKind.SwitchKeyword,
73+
symbol: SyntaxKind.SymbolKeyword,
74+
this: SyntaxKind.ThisKeyword,
75+
throw: SyntaxKind.ThrowKeyword,
76+
true: SyntaxKind.TrueKeyword,
77+
try: SyntaxKind.TryKeyword,
78+
type: SyntaxKind.TypeKeyword,
79+
typeof: SyntaxKind.TypeOfKeyword,
80+
undefined: SyntaxKind.UndefinedKeyword,
81+
unique: SyntaxKind.UniqueKeyword,
82+
unknown: SyntaxKind.UnknownKeyword,
83+
var: SyntaxKind.VarKeyword,
84+
void: SyntaxKind.VoidKeyword,
85+
while: SyntaxKind.WhileKeyword,
86+
with: SyntaxKind.WithKeyword,
87+
yield: SyntaxKind.YieldKeyword,
88+
async: SyntaxKind.AsyncKeyword,
89+
await: SyntaxKind.AwaitKeyword,
90+
of: SyntaxKind.OfKeyword,
91+
};
92+
93+
export const textToKeyword = new Map(getEntries(textToKeywordObj));
94+
95+
export const textToToken = new Map(getEntries({
96+
...textToKeywordObj,
97+
"{": SyntaxKind.OpenBraceToken,
98+
"}": SyntaxKind.CloseBraceToken,
99+
"(": SyntaxKind.OpenParenToken,
100+
")": SyntaxKind.CloseParenToken,
101+
"[": SyntaxKind.OpenBracketToken,
102+
"]": SyntaxKind.CloseBracketToken,
103+
".": SyntaxKind.DotToken,
104+
"...": SyntaxKind.DotDotDotToken,
105+
";": SyntaxKind.SemicolonToken,
106+
",": SyntaxKind.CommaToken,
107+
"<": SyntaxKind.LessThanToken,
108+
">": SyntaxKind.GreaterThanToken,
109+
"<=": SyntaxKind.LessThanEqualsToken,
110+
">=": SyntaxKind.GreaterThanEqualsToken,
111+
"==": SyntaxKind.EqualsEqualsToken,
112+
"!=": SyntaxKind.ExclamationEqualsToken,
113+
"===": SyntaxKind.EqualsEqualsEqualsToken,
114+
"!==": SyntaxKind.ExclamationEqualsEqualsToken,
115+
"=>": SyntaxKind.EqualsGreaterThanToken,
116+
"+": SyntaxKind.PlusToken,
117+
"-": SyntaxKind.MinusToken,
118+
"**": SyntaxKind.AsteriskAsteriskToken,
119+
"*": SyntaxKind.AsteriskToken,
120+
"/": SyntaxKind.SlashToken,
121+
"%": SyntaxKind.PercentToken,
122+
"++": SyntaxKind.PlusPlusToken,
123+
"--": SyntaxKind.MinusMinusToken,
124+
"<<": SyntaxKind.LessThanLessThanToken,
125+
"</": SyntaxKind.LessThanSlashToken,
126+
">>": SyntaxKind.GreaterThanGreaterThanToken,
127+
">>>": SyntaxKind.GreaterThanGreaterThanGreaterThanToken,
128+
"&": SyntaxKind.AmpersandToken,
129+
"|": SyntaxKind.BarToken,
130+
"^": SyntaxKind.CaretToken,
131+
"!": SyntaxKind.ExclamationToken,
132+
"~": SyntaxKind.TildeToken,
133+
"&&": SyntaxKind.AmpersandAmpersandToken,
134+
"||": SyntaxKind.BarBarToken,
135+
"?": SyntaxKind.QuestionToken,
136+
"??": SyntaxKind.QuestionQuestionToken,
137+
"?.": SyntaxKind.QuestionDotToken,
138+
":": SyntaxKind.ColonToken,
139+
"=": SyntaxKind.EqualsToken,
140+
"+=": SyntaxKind.PlusEqualsToken,
141+
"-=": SyntaxKind.MinusEqualsToken,
142+
"*=": SyntaxKind.AsteriskEqualsToken,
143+
"**=": SyntaxKind.AsteriskAsteriskEqualsToken,
144+
"/=": SyntaxKind.SlashEqualsToken,
145+
"%=": SyntaxKind.PercentEqualsToken,
146+
"<<=": SyntaxKind.LessThanLessThanEqualsToken,
147+
">>=": SyntaxKind.GreaterThanGreaterThanEqualsToken,
148+
">>>=": SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken,
149+
"&=": SyntaxKind.AmpersandEqualsToken,
150+
"|=": SyntaxKind.BarEqualsToken,
151+
"^=": SyntaxKind.CaretEqualsToken,
152+
"||=": SyntaxKind.BarBarEqualsToken,
153+
"&&=": SyntaxKind.AmpersandAmpersandEqualsToken,
154+
"??=": SyntaxKind.QuestionQuestionEqualsToken,
155+
"@": SyntaxKind.AtToken,
156+
"#": SyntaxKind.HashToken,
157+
"`": SyntaxKind.BacktickToken,
158+
}));

‎src/compiler/scannerUtilities.ts

Lines changed: 1 addition & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,4 @@
1-
import { getEntries } from "./core";
2-
import { MapLike } from "./corePublic";
3-
import {
4-
CharacterCodes,
5-
KeywordSyntaxKind,
6-
SyntaxKind,
7-
} from "./types";
8-
9-
/** @internal */
10-
export const textToKeywordObj: MapLike<KeywordSyntaxKind> = {
11-
abstract: SyntaxKind.AbstractKeyword,
12-
accessor: SyntaxKind.AccessorKeyword,
13-
any: SyntaxKind.AnyKeyword,
14-
as: SyntaxKind.AsKeyword,
15-
asserts: SyntaxKind.AssertsKeyword,
16-
assert: SyntaxKind.AssertKeyword,
17-
bigint: SyntaxKind.BigIntKeyword,
18-
boolean: SyntaxKind.BooleanKeyword,
19-
break: SyntaxKind.BreakKeyword,
20-
case: SyntaxKind.CaseKeyword,
21-
catch: SyntaxKind.CatchKeyword,
22-
class: SyntaxKind.ClassKeyword,
23-
continue: SyntaxKind.ContinueKeyword,
24-
const: SyntaxKind.ConstKeyword,
25-
["" + "constructor"]: SyntaxKind.ConstructorKeyword,
26-
debugger: SyntaxKind.DebuggerKeyword,
27-
declare: SyntaxKind.DeclareKeyword,
28-
default: SyntaxKind.DefaultKeyword,
29-
delete: SyntaxKind.DeleteKeyword,
30-
do: SyntaxKind.DoKeyword,
31-
else: SyntaxKind.ElseKeyword,
32-
enum: SyntaxKind.EnumKeyword,
33-
export: SyntaxKind.ExportKeyword,
34-
extends: SyntaxKind.ExtendsKeyword,
35-
false: SyntaxKind.FalseKeyword,
36-
finally: SyntaxKind.FinallyKeyword,
37-
for: SyntaxKind.ForKeyword,
38-
from: SyntaxKind.FromKeyword,
39-
function: SyntaxKind.FunctionKeyword,
40-
get: SyntaxKind.GetKeyword,
41-
if: SyntaxKind.IfKeyword,
42-
implements: SyntaxKind.ImplementsKeyword,
43-
import: SyntaxKind.ImportKeyword,
44-
in: SyntaxKind.InKeyword,
45-
infer: SyntaxKind.InferKeyword,
46-
instanceof: SyntaxKind.InstanceOfKeyword,
47-
interface: SyntaxKind.InterfaceKeyword,
48-
intrinsic: SyntaxKind.IntrinsicKeyword,
49-
is: SyntaxKind.IsKeyword,
50-
keyof: SyntaxKind.KeyOfKeyword,
51-
let: SyntaxKind.LetKeyword,
52-
module: SyntaxKind.ModuleKeyword,
53-
namespace: SyntaxKind.NamespaceKeyword,
54-
never: SyntaxKind.NeverKeyword,
55-
new: SyntaxKind.NewKeyword,
56-
null: SyntaxKind.NullKeyword,
57-
number: SyntaxKind.NumberKeyword,
58-
object: SyntaxKind.ObjectKeyword,
59-
package: SyntaxKind.PackageKeyword,
60-
private: SyntaxKind.PrivateKeyword,
61-
protected: SyntaxKind.ProtectedKeyword,
62-
public: SyntaxKind.PublicKeyword,
63-
override: SyntaxKind.OverrideKeyword,
64-
out: SyntaxKind.OutKeyword,
65-
readonly: SyntaxKind.ReadonlyKeyword,
66-
require: SyntaxKind.RequireKeyword,
67-
global: SyntaxKind.GlobalKeyword,
68-
return: SyntaxKind.ReturnKeyword,
69-
satisfies: SyntaxKind.SatisfiesKeyword,
70-
set: SyntaxKind.SetKeyword,
71-
static: SyntaxKind.StaticKeyword,
72-
string: SyntaxKind.StringKeyword,
73-
super: SyntaxKind.SuperKeyword,
74-
switch: SyntaxKind.SwitchKeyword,
75-
symbol: SyntaxKind.SymbolKeyword,
76-
this: SyntaxKind.ThisKeyword,
77-
throw: SyntaxKind.ThrowKeyword,
78-
true: SyntaxKind.TrueKeyword,
79-
try: SyntaxKind.TryKeyword,
80-
type: SyntaxKind.TypeKeyword,
81-
typeof: SyntaxKind.TypeOfKeyword,
82-
undefined: SyntaxKind.UndefinedKeyword,
83-
unique: SyntaxKind.UniqueKeyword,
84-
unknown: SyntaxKind.UnknownKeyword,
85-
var: SyntaxKind.VarKeyword,
86-
void: SyntaxKind.VoidKeyword,
87-
while: SyntaxKind.WhileKeyword,
88-
with: SyntaxKind.WithKeyword,
89-
yield: SyntaxKind.YieldKeyword,
90-
async: SyntaxKind.AsyncKeyword,
91-
await: SyntaxKind.AwaitKeyword,
92-
of: SyntaxKind.OfKeyword,
93-
};
94-
95-
/** @internal */
96-
export const textToKeyword = new Map(getEntries(textToKeywordObj));
97-
98-
/** @internal */
99-
export const textToToken = new Map(getEntries({
100-
...textToKeywordObj,
101-
"{": SyntaxKind.OpenBraceToken,
102-
"}": SyntaxKind.CloseBraceToken,
103-
"(": SyntaxKind.OpenParenToken,
104-
")": SyntaxKind.CloseParenToken,
105-
"[": SyntaxKind.OpenBracketToken,
106-
"]": SyntaxKind.CloseBracketToken,
107-
".": SyntaxKind.DotToken,
108-
"...": SyntaxKind.DotDotDotToken,
109-
";": SyntaxKind.SemicolonToken,
110-
",": SyntaxKind.CommaToken,
111-
"<": SyntaxKind.LessThanToken,
112-
">": SyntaxKind.GreaterThanToken,
113-
"<=": SyntaxKind.LessThanEqualsToken,
114-
">=": SyntaxKind.GreaterThanEqualsToken,
115-
"==": SyntaxKind.EqualsEqualsToken,
116-
"!=": SyntaxKind.ExclamationEqualsToken,
117-
"===": SyntaxKind.EqualsEqualsEqualsToken,
118-
"!==": SyntaxKind.ExclamationEqualsEqualsToken,
119-
"=>": SyntaxKind.EqualsGreaterThanToken,
120-
"+": SyntaxKind.PlusToken,
121-
"-": SyntaxKind.MinusToken,
122-
"**": SyntaxKind.AsteriskAsteriskToken,
123-
"*": SyntaxKind.AsteriskToken,
124-
"/": SyntaxKind.SlashToken,
125-
"%": SyntaxKind.PercentToken,
126-
"++": SyntaxKind.PlusPlusToken,
127-
"--": SyntaxKind.MinusMinusToken,
128-
"<<": SyntaxKind.LessThanLessThanToken,
129-
"</": SyntaxKind.LessThanSlashToken,
130-
">>": SyntaxKind.GreaterThanGreaterThanToken,
131-
">>>": SyntaxKind.GreaterThanGreaterThanGreaterThanToken,
132-
"&": SyntaxKind.AmpersandToken,
133-
"|": SyntaxKind.BarToken,
134-
"^": SyntaxKind.CaretToken,
135-
"!": SyntaxKind.ExclamationToken,
136-
"~": SyntaxKind.TildeToken,
137-
"&&": SyntaxKind.AmpersandAmpersandToken,
138-
"||": SyntaxKind.BarBarToken,
139-
"?": SyntaxKind.QuestionToken,
140-
"??": SyntaxKind.QuestionQuestionToken,
141-
"?.": SyntaxKind.QuestionDotToken,
142-
":": SyntaxKind.ColonToken,
143-
"=": SyntaxKind.EqualsToken,
144-
"+=": SyntaxKind.PlusEqualsToken,
145-
"-=": SyntaxKind.MinusEqualsToken,
146-
"*=": SyntaxKind.AsteriskEqualsToken,
147-
"**=": SyntaxKind.AsteriskAsteriskEqualsToken,
148-
"/=": SyntaxKind.SlashEqualsToken,
149-
"%=": SyntaxKind.PercentEqualsToken,
150-
"<<=": SyntaxKind.LessThanLessThanEqualsToken,
151-
">>=": SyntaxKind.GreaterThanGreaterThanEqualsToken,
152-
">>>=": SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken,
153-
"&=": SyntaxKind.AmpersandEqualsToken,
154-
"|=": SyntaxKind.BarEqualsToken,
155-
"^=": SyntaxKind.CaretEqualsToken,
156-
"||=": SyntaxKind.BarBarEqualsToken,
157-
"&&=": SyntaxKind.AmpersandAmpersandEqualsToken,
158-
"??=": SyntaxKind.QuestionQuestionEqualsToken,
159-
"@": SyntaxKind.AtToken,
160-
"#": SyntaxKind.HashToken,
161-
"`": SyntaxKind.BacktickToken,
162-
}));
1+
import { CharacterCodes } from "./types";
1632

1643
/** @internal */
1654
export function positionIsSynthesized(pos: number): boolean {

‎src/services/codefixes/fixJSDocTypes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import { Diagnostics } from "../../compiler/diagnosticInformationMap.generated";
2+
import { append } from "../../compiler/core";
23
import {
3-
append,
44
AsExpression,
55
CallSignatureDeclaration,
66
ConstructSignatureDeclaration,
77
DiagnosticMessage,
88
FunctionDeclaration,
99
GetAccessorDeclaration,
1010
IndexSignatureDeclaration,
11-
isJSDocNullableType,
1211
MappedTypeNode,
1312
MethodDeclaration,
1413
MethodSignature,
@@ -36,6 +35,7 @@ import {
3635
import { ChangeTracker } from "../textChanges";
3736
import { CodeFixAction } from "../types";
3837
import { getTokenAtPosition } from "../utilities";
38+
import { isJSDocNullableType } from "../../compiler/factory/nodeTests";
3939

4040
const fixIdPlain = "fixJSDocTypes_plain";
4141
const fixIdNullable = "fixJSDocTypes_nullable";

0 commit comments

Comments
 (0)