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: 2 additions & 2 deletions pkg/ast/ast.go
Original file line number Diff line number Diff line change
Expand Up @@ -2214,11 +2214,11 @@ func IsWriteAccess(node *Node) bool {
}

func IsWriteAccessForReference(node *Node) bool {
decl := getDeclarationFromName(node)
decl := GetDeclarationFromName(node)
return (decl != nil && declarationIsWriteAccess(decl)) || node.Kind == KindDefaultKeyword || IsWriteAccess(node)
}

func getDeclarationFromName(name *Node) *Declaration {
func GetDeclarationFromName(name *Node) *Declaration {
if name == nil || name.Parent == nil {
return nil
}
Expand Down
89 changes: 87 additions & 2 deletions pkg/ast/utilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ func GetNameOfDeclaration(declaration *Node) *Node {
return nonAssignedName
}
if IsFunctionExpression(declaration) || IsArrowFunction(declaration) || IsClassExpression(declaration) {
return getAssignedName(declaration)
return GetAssignedName(declaration)
}
return nil
}
Expand Down Expand Up @@ -1415,7 +1415,7 @@ func GetNonAssignedNameOfDeclaration(declaration *Node) *Node {
return declaration.Name()
}

func getAssignedName(node *Node) *Node {
func GetAssignedName(node *Node) *Node {
parent := node.Parent
if parent != nil {
switch parent.Kind {
Expand Down Expand Up @@ -3441,6 +3441,91 @@ func IsRightSideOfPropertyAccess(node *Node) bool {
return node.Parent.Kind == KindPropertyAccessExpression && node.Parent.Name() == node
}

func IsArgumentExpressionOfElementAccess(node *Node) bool {
return node.Parent != nil && node.Parent.Kind == KindElementAccessExpression && node.Parent.AsElementAccessExpression().ArgumentExpression == node
}

func ClimbPastPropertyAccess(node *Node) *Node {
if IsRightSideOfPropertyAccess(node) {
return node.Parent
}
return node
}

func climbPastPropertyOrElementAccess(node *Node) *Node {
if IsRightSideOfPropertyAccess(node) || IsArgumentExpressionOfElementAccess(node) {
return node.Parent
}
return node
}

func selectExpressionOfCallOrNewExpressionOrDecorator(node *Node) *Node {
if IsCallExpression(node) || IsNewExpression(node) || IsDecorator(node) {
return node.Expression()
}
return nil
}

func selectTagOfTaggedTemplateExpression(node *Node) *Node {
if IsTaggedTemplateExpression(node) {
return node.AsTaggedTemplateExpression().Tag
}
return nil
}

func selectTagNameOfJsxOpeningLikeElement(node *Node) *Node {
if IsJsxOpeningElement(node) || IsJsxSelfClosingElement(node) {
return node.TagName()
}
return nil
}

func IsCallExpressionTarget(node *Node, includeElementAccess bool, skipPastOuterExpressions bool) bool {
return isCalleeWorker(node, IsCallExpression, selectExpressionOfCallOrNewExpressionOrDecorator, includeElementAccess, skipPastOuterExpressions)
}

func IsNewExpressionTarget(node *Node, includeElementAccess bool, skipPastOuterExpressions bool) bool {
return isCalleeWorker(node, IsNewExpression, selectExpressionOfCallOrNewExpressionOrDecorator, includeElementAccess, skipPastOuterExpressions)
}

func IsCallOrNewExpressionTarget(node *Node, includeElementAccess bool, skipPastOuterExpressions bool) bool {
return isCalleeWorker(node, IsCallOrNewExpression, selectExpressionOfCallOrNewExpressionOrDecorator, includeElementAccess, skipPastOuterExpressions)
}

func IsTaggedTemplateTag(node *Node, includeElementAccess bool, skipPastOuterExpressions bool) bool {
return isCalleeWorker(node, IsTaggedTemplateExpression, selectTagOfTaggedTemplateExpression, includeElementAccess, skipPastOuterExpressions)
}

func IsDecoratorTarget(node *Node, includeElementAccess bool, skipPastOuterExpressions bool) bool {
return isCalleeWorker(node, IsDecorator, selectExpressionOfCallOrNewExpressionOrDecorator, includeElementAccess, skipPastOuterExpressions)
}

func IsJsxOpeningLikeElementTagName(node *Node, includeElementAccess bool, skipPastOuterExpressions bool) bool {
return isCalleeWorker(node, IsJsxOpeningLikeElement, selectTagNameOfJsxOpeningLikeElement, includeElementAccess, skipPastOuterExpressions)
}

func isCalleeWorker(
node *Node,
pred func(*Node) bool,
calleeSelector func(*Node) *Node,
includeElementAccess bool,
skipPastOuterExpressions bool,
) bool {
var target *Node
if includeElementAccess {
target = climbPastPropertyOrElementAccess(node)
} else {
target = ClimbPastPropertyAccess(node)
}
if skipPastOuterExpressions {
// Only skip outer expressions if the target is actually an expression node
if IsExpression(target) {
target = SkipOuterExpressions(target, OEKAll)
}
}
return target != nil && target.Parent != nil && pred(target.Parent) && calleeSelector(target.Parent) == target
}

func IsRightSideOfQualifiedNameOrPropertyAccess(node *Node) bool {
parent := node.Parent
switch parent.Kind {
Expand Down
16 changes: 16 additions & 0 deletions pkg/diagnostics/diagnostics_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions pkg/diagnostics/extraDiagnosticMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,22 @@
"category": "Message",
"code": 100004
},
"{0} references": {
"category": "Message",
"code": 100005
},
"1 reference": {
"category": "Message",
"code": 100006
},
"{0} implementations": {
"category": "Message",
"code": 100007
},
"1 implementation": {
"category": "Message",
"code": 100008
},
"Non-relative paths are not allowed. Did you forget a leading './'?": {
"category": "Error",
"code": 5090
Expand Down
Loading