chore: remove duplicates

mrjosh · Dec 15, 2024 · b510415 · b510415
1 parent 7bf68f5
commit b510415
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/internal/language_features/generic_template_context.go b/internal/language_features/generic_template_context.go
@@ -22,9 +22,7 @@ func (f *GenericTemplateContextFeature) getReferencesFromSymbolTable(templateCon
 
 	for _, doc := range f.GenericDocumentUseCase.DocumentStore.GetAllTemplateDocs() {
 		referenceRanges := doc.SymbolTable.GetTemplateContextRanges(templateContext)
-		for _, referenceRange := range referenceRanges {
-			locations = append(locations, util.RangeToLocation(doc.URI, referenceRange))
-		}
+		locations = append(locations, util.RangesToLocations(doc.URI, referenceRanges)...)
 	}
 
 	return locations

diff --git a/internal/language_features/includes.go b/internal/language_features/includes.go
@@ -88,9 +88,7 @@ func (f *IncludesFeature) getReferenceLocations(includeName string) []lsp.Locati
 	locations := []lsp.Location{}
 	for _, doc := range f.GenericDocumentUseCase.DocumentStore.GetAllTemplateDocs() {
 		referenceRanges := doc.SymbolTable.GetIncludeReference(includeName)
-		for _, referenceRange := range referenceRanges {
-			locations = append(locations, util.RangeToLocation(doc.URI, referenceRange))
-		}
+		locations = append(locations, util.RangesToLocations(doc.URI, referenceRanges)...)
 		if len(locations) > 0 {
 			charts.SyncToDisk(doc)
 		}
@@ -103,9 +101,7 @@ func (f *IncludesFeature) getDefinitionLocations(includeName string) []lsp.Locat
 	locations := []lsp.Location{}
 	for _, doc := range f.GenericDocumentUseCase.DocumentStore.GetAllTemplateDocs() {
 		definitionRanges := doc.SymbolTable.GetIncludeDefinitions(includeName)
-		for _, definitionRange := range definitionRanges {
-			locations = append(locations, util.RangeToLocation(doc.URI, definitionRange))
-		}
+		locations = append(locations, util.RangesToLocations(doc.URI, definitionRanges)...)
 		if len(locations) > 0 {
 			charts.SyncToDisk(doc)
 		}

diff --git a/internal/language_features/template_context.go b/internal/language_features/template_context.go
@@ -57,9 +57,7 @@ func (f *TemplateContextFeature) getReferenceLocations(templateContext symboltab
 	locations := []lsp.Location{}
 	for _, doc := range f.GenericDocumentUseCase.DocumentStore.GetAllTemplateDocs() {
 		referenceRanges := doc.SymbolTable.GetTemplateContextRanges(templateContext)
-		for _, referenceRange := range referenceRanges {
-			locations = append(locations, util.RangeToLocation(doc.URI, referenceRange))
-		}
+		locations = append(locations, util.RangesToLocations(doc.URI, referenceRanges)...)
 	}
 
 	return append(locations, f.getDefinitionLocations(templateContext)...)

diff --git a/internal/language_features/variables.go b/internal/language_features/variables.go
@@ -37,9 +37,7 @@ func (f *VariablesFeature) References() (result []lsp.Location, err error) {
 		return []lsp.Location{}, err
 	}
 
-	for _, reference := range variableReferences {
-		result = append(result, util.RangeToLocation(f.Document.URI, reference))
-	}
+	result = append(result, util.RangesToLocations(f.Document.URI, variableReferences)...)
 	return result, nil
 }
 

diff --git a/internal/util/points.go b/internal/util/points.go
@@ -23,3 +23,10 @@ func RangeToLocation(URI uri.URI, range_ sitter.Range) lsp.Location {
 		},
 	}
 }
+
+func RangesToLocations(URI uri.URI, ranges []sitter.Range) (locations []lsp.Location) {
+	for _, definitionRange := range ranges {
+		locations = append(locations, RangeToLocation(URI, definitionRange))
+	}
+	return locations
+}
diff --git a/internal/util/points_test.go b/internal/util/points_test.go