fix: class_declaration in java (#1750)

pkg/languages/golang/pattern/pattern.go

@@ -175,6 +175,6 @@ func (*Pattern) TranslateContent(fromNodeType, toNodeType, content string) strin
 	return content
 }
 
-func (*Pattern) ContainerTypes() []string {
-	return patternMatchNodeContainerTypes
+func (*Pattern) IsContainer(node *tree.Node) bool {
+	return slices.Contains(patternMatchNodeContainerTypes, node.Type())
 }

pkg/languages/java/pattern/pattern.go

@@ -23,7 +23,6 @@ var (
 		"formal_parameters",
 		"modifiers",
 		"method_declaration",
-		"class_declaration",
 		"program",
 	}
 
@@ -147,6 +146,16 @@ func (*Pattern) NodeTypes(node *tree.Node) []string {
 	return []string{node.Type()}
 }
 
-func (*Pattern) ContainerTypes() []string {
-	return matchNodeContainerTypes
+func (*Pattern) IsContainer(node *tree.Node) bool {
+	if slices.Contains(matchNodeContainerTypes, node.Type()) {
+		return true
+	}
+
+	if node.Type() == "class_declaration" {
+		if children := node.NamedChildren(); len(children) != 0 && children[0].Type() == "modifiers" {
+			return true
+		}
+	}
+
+	return false
 }

pkg/languages/javascript/pattern/pattern.go

@@ -77,8 +77,8 @@ func (*Pattern) FindUnanchoredPoints(input []byte) [][]int {
 	return ellipsisRegex.FindAllIndex(input, -1)
 }
 
-func (*Pattern) ContainerTypes() []string {
-	return patternMatchNodeContainerTypes
+func (*Pattern) IsContainer(node *tree.Node) bool {
+	return slices.Contains(patternMatchNodeContainerTypes, node.Type())
 }
 
 func (*Pattern) LeafContentTypes() []string {

pkg/languages/php/pattern/pattern.go

@@ -246,6 +246,6 @@ func (*Pattern) TranslateContent(fromNodeType, toNodeType, content string) strin
 	return content
 }
 
-func (*Pattern) ContainerTypes() []string {
-	return patternMatchNodeContainerTypes
+func (*Pattern) IsContainer(node *tree.Node) bool {
+	return slices.Contains(patternMatchNodeContainerTypes, node.Type())
 }

pkg/languages/python/pattern/pattern.go

@@ -176,17 +176,6 @@ func (patternLanguage *Pattern) NodeTypes(node *tree.Node) []string {
 	return []string{node.Type()}
 }
 
-// func (*Pattern) TranslateContent(fromNodeType, toNodeType, content string) string {
-// 	if fromNodeType == "string" && toNodeType == "encapsed_string" {
-// 		return fmt.Sprintf(`"%s"`, content[1:len(content)-1])
-// 	}
-// 	if fromNodeType == "encapsed_string" && toNodeType == "string" {
-// 		return fmt.Sprintf("'%s'", content[1:len(content)-1])
-// 	}
-
-// 	return content
-// }
-
-func (*Pattern) ContainerTypes() []string {
-	return patternMatchNodeContainerTypes
+func (*Pattern) IsContainer(node *tree.Node) bool {
+	return slices.Contains(patternMatchNodeContainerTypes, node.Type())
 }

pkg/languages/ruby/pattern/pattern.go

@@ -94,8 +94,8 @@ func (*Pattern) AnonymousParentTypes() []string {
 	return anonymousPatternNodeParentTypes
 }
 
-func (*Pattern) ContainerTypes() []string {
-	return patternMatchNodeContainerTypes
+func (*Pattern) IsContainer(node *tree.Node) bool {
+	return slices.Contains(patternMatchNodeContainerTypes, node.Type())
 }
 
 func (*Pattern) IsAnchored(node *tree.Node) (bool, bool) {

pkg/scanner/detectors/customrule/patternquery/builder/builder.go

@@ -117,7 +117,6 @@ func Build(
 	builder.setMatchNode(
 		inputParams.MatchNodeOffset,
 		focusedVariable,
-		patternLanguage.ContainerTypes(),
 		tree.RootNode(),
 	)
 	if builder.matchNode == nil {
@@ -386,7 +385,7 @@ func getVariableFor(
 	patternLanguage language.Pattern,
 	variables []language.PatternVariable,
 ) *language.PatternVariable {
-	if slices.Contains(patternLanguage.ContainerTypes(), node.Type()) {
+	if patternLanguage.IsContainer(node) {
 		return nil
 	}
 
@@ -410,7 +409,6 @@ func (builder *builder) newParam() string {
 func (builder *builder) setMatchNode(
 	offset int,
 	focusedVariable string,
-	containerTypes []string,
 	node *asttree.Node,
 ) {
 	err := node.Walk(func(node *asttree.Node, visitChildren func() error) error {
@@ -420,7 +418,7 @@ func (builder *builder) setMatchNode(
 				return nil
 			}
 		} else {
-			if node.ContentStart.Byte == offset && !slices.Contains(containerTypes, node.Type()) {
+			if node.ContentStart.Byte == offset && !builder.patternLanguage.IsContainer(node) {
 				builder.matchNode = node
 				return nil
 			}

pkg/scanner/language/pattern.go

@@ -94,7 +94,8 @@ type Pattern interface {
 	//   some_call($<!>$<VAR>)
 	// we would return `[[10, 14]]`
 	FindMatchNode(input []byte) [][]int
-	// ContainerTypes returns a list of node types from which a match node should
+	// IsContainer returns a bool when node is included in the list of containers
+	// from which a match node should
 	// not be able to escape. There can be multiple nodes in the tree at the same
 	// character position, and we want to allow a match node to be the highest
 	// position node, terminating at a container node.
@@ -106,7 +107,7 @@ type Pattern interface {
 	// given the following Ruby code matching the pattern:
 	//   some_call key: value, other_key: value2
 	// we want the content of the match to be `key: value` and not `key: value, other_key: value2`
-	ContainerTypes() []string
+	IsContainer(node *tree.Node) bool
 
 	// Handle cases where the language requires preamble (e.g. PHP requires `<?php`)
 	AdjustInput(input string) string

pkg/scanner/language/patternbase.go

@@ -20,8 +20,8 @@ func (*PatternBase) ShouldSkipNode(node *tree.Node) bool {
 	return false
 }
 
-func (*PatternBase) ContainerTypes() []string {
-	return nil
+func (*PatternBase) IsContainer(node *tree.Node) bool {
+	return false
 }
 
 func (*PatternBase) FixupVariableDummyValue(input []byte, node *tree.Node, dummyValue string) string {