Skip to content
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

Jump to bottom

Fix the definition of interfaces for typescript #4297

Merged
merged 1 commit into from
Nov 4, 2024
+21 −19
Merged

Fix the definition of interfaces for typescript #4297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions javascript/typescript/CSharp/TypeScriptParserBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ protected bool notLineTerminator()
return !here(LineTerminator);
}

protected bool notOpenBraceAndNotFunction()
protected bool notOpenBraceAndNotFunctionAndNotInterface()
{
int nextTokenType = _input.LT(1).Type;
return nextTokenType != OpenBrace && nextTokenType != Function_;
return nextTokenType != OpenBrace && nextTokenType != Function_ && nextTokenType != Interface;
}

protected bool closeBrace()
Expand Down
6 changes: 3 additions & 3 deletions javascript/typescript/Cpp/TypeScriptParserBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ bool TypeScriptParserBase::notLineTerminator()
return !here(TypeScriptParser::LineTerminator);
}

bool TypeScriptParserBase::notOpenBraceAndNotFunction()
bool TypeScriptParserBase::notOpenBraceAndNotFunctionAndNotInterface()
{
int nextTokenType = _input->LT(1)->getType();
return nextTokenType != TypeScriptParser::OpenBrace && nextTokenType != TypeScriptParser::Function_;

return nextTokenType != TypeScriptParser::OpenBrace && nextTokenType != TypeScriptParser::Function_
&& nextTokenType != TypeScriptParser::Interface;
}

bool TypeScriptParserBase::closeBrace()
Expand Down
2 changes: 1 addition & 1 deletion javascript/typescript/Cpp/TypeScriptParserBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class TypeScriptParserBase : public antlr4::Parser {
bool n(std::string str);
bool next(std::string str);
bool notLineTerminator();
bool notOpenBraceAndNotFunction();
bool notOpenBraceAndNotFunctionAndNotInterface();
bool closeBrace();
bool here(int type);
bool lineTerminatorAhead();
Expand Down
5 changes: 3 additions & 2 deletions javascript/typescript/Java/TypeScriptParserBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ protected boolean notLineTerminator() {
return !here(TypeScriptParser.LineTerminator);
}

protected boolean notOpenBraceAndNotFunction() {
protected boolean notOpenBraceAndNotFunctionAndNotInterface() {
int nextTokenType = _input.LT(1).getType();
return nextTokenType != TypeScriptParser.OpenBrace && nextTokenType != TypeScriptParser.Function_;
return nextTokenType != TypeScriptParser.OpenBrace && nextTokenType != TypeScriptParser.Function_
&& nextTokenType != TypeScriptParser.Interface;
}

protected boolean closeBrace() {
Expand Down
5 changes: 3 additions & 2 deletions javascript/typescript/TypeScript/TypeScriptParserBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ export default abstract class TypeScriptParserBase extends Parser {
return !this.here(TypeScriptParser.LineTerminator);
}

protected notOpenBraceAndNotFunction():boolean {
protected notOpenBraceAndNotFunctionAndNotInterface():boolean {
const nextTokenType:number = this._input.LT(1).type;
return nextTokenType != TypeScriptParser.OpenBrace && nextTokenType != TypeScriptParser.Function_;
return nextTokenType != TypeScriptParser.OpenBrace && nextTokenType != TypeScriptParser.Function_
&& nextTokenType != TypeScriptParser.Interface;
}

protected closeBrace():boolean {
Expand Down
18 changes: 9 additions & 9 deletions javascript/typescript/TypeScriptParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,14 @@ sourceElement

statement
: block
| variableStatement
| variableStatement
| importStatement
| exportStatement
| emptyStatement_
| abstractDeclaration //ADDED
| classDeclaration
| functionDeclaration
| expressionStatement
| expressionStatement
| interfaceDeclaration //ADDED
| namespaceDeclaration //ADDED
| ifStatement
Expand Down Expand Up @@ -476,7 +476,7 @@ emptyStatement_
;

expressionStatement
: {this.notOpenBraceAndNotFunction()}? expressionSequence SemiColon?
: {this.notOpenBraceAndNotFunctionAndNotInterface()}? expressionSequence SemiColon?
;

ifStatement
Expand Down Expand Up @@ -752,11 +752,11 @@ singleExpression
| '-' singleExpression # UnaryMinusExpression
| '~' singleExpression # BitNotExpression
| '!' singleExpression # NotExpression
| Await singleExpression # AwaitExpression
| <assoc = right> singleExpression '**' singleExpression # PowerExpression
| Await singleExpression # AwaitExpression
| <assoc = right> singleExpression '**' singleExpression # PowerExpression
| singleExpression ('*' | '/' | '%') singleExpression # MultiplicativeExpression
| singleExpression ('+' | '-') singleExpression # AdditiveExpression
| singleExpression '??' singleExpression # CoalesceExpression
| singleExpression '??' singleExpression # CoalesceExpression
| singleExpression ('<<' | '>' '>' | '>' '>' '>') singleExpression # BitShiftExpression
| singleExpression ('<' | '>' | '<=' | '>=') singleExpression # RelationalExpression
| singleExpression Instanceof singleExpression # InstanceofExpression
Expand Down Expand Up @@ -801,7 +801,7 @@ assignable
;

anonymousFunction
: functionDeclaration
: functionDeclaration
| Async? Function_ '*'? '(' formalParameterList? ')' typeAnnotation? '{' functionBody '}'
| arrowFunctionDeclaration
;
Expand Down Expand Up @@ -833,7 +833,7 @@ assignmentOperator
| '^='
| '|='
| '**='
| '??='
| '??='
;

literal
Expand Down Expand Up @@ -964,7 +964,7 @@ keyword
| Static
| Yield
| Async
| Await
| Await
| ReadOnly
| From
| As
Expand Down
Loading