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: resolution of references to declarations of wrong node type #599

Merged
merged 2 commits into from
Oct 2, 2023
Merged

fix: resolution of references to declarations of wrong node type #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dec508
fix: resolution of references to declarations of wrong type
lars-reimann Oct 2, 2023
ffb39c5
style: apply automated linter fixes
megalinter-bot Oct 2, 2023
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
39 changes: 21 additions & 18 deletions src/language/scoping/safe-ds-scope-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
AstNode,
AstNodeDescription,
AstReflection,
DefaultScopeProvider,
EMPTY_SCOPE,
getContainerOfType,
Expand Down Expand Up @@ -62,12 +63,14 @@ import { SafeDsTypeComputer } from '../typing/safe-ds-type-computer.js';
import { SafeDsPackageManager } from '../workspace/safe-ds-package-manager.js';

export class SafeDsScopeProvider extends DefaultScopeProvider {
private readonly astReflection: AstReflection;
private readonly packageManager: SafeDsPackageManager;
private readonly typeComputer: SafeDsTypeComputer;

constructor(services: SafeDsServices) {
super(services);

this.astReflection = services.shared.AstReflection;
this.packageManager = services.workspace.PackageManager;
this.typeComputer = services.types.TypeComputer;
}
Expand Down Expand Up @@ -350,6 +353,23 @@ export class SafeDsScopeProvider extends DefaultScopeProvider {
return this.createScope(explicitlyImportedDeclarations, outerScope);
}

private builtinDeclarations(referenceType: string): AstNodeDescription[] {
return this.packageManager.getDeclarationsInPackageOrSubpackage('safeds', {
nodeType: referenceType,
hideInternal: true,
});
}

private declarationsInSamePackage(packageName: string | null, referenceType: string): AstNodeDescription[] {
if (!packageName) {
return [];
}

return this.packageManager.getDeclarationsInPackage(packageName, {
nodeType: referenceType,
});
}

private explicitlyImportedDeclarations(referenceType: string, node: AstNode): AstNodeDescription[] {
const containingModule = getContainerOfType(node, isSdsModule);
const imports = importsOrEmpty(containingModule);
Expand All @@ -359,7 +379,7 @@ export class SafeDsScopeProvider extends DefaultScopeProvider {
if (isSdsQualifiedImport(imp)) {
for (const importedDeclaration of importedDeclarationsOrEmpty(imp)) {
const description = importedDeclaration.declaration.$nodeDescription;
if (!description) {
if (!description || !this.astReflection.isSubtype(description.type, referenceType)) {
continue;
}

Expand All @@ -380,21 +400,4 @@ export class SafeDsScopeProvider extends DefaultScopeProvider {

return result;
}

private declarationsInSamePackage(packageName: string | null, referenceType: string): AstNodeDescription[] {
if (!packageName) {
return [];
}

return this.packageManager.getDeclarationsInPackage(packageName, {
nodeType: referenceType,
});
}

private builtinDeclarations(referenceType: string): AstNodeDescription[] {
return this.packageManager.getDeclarationsInPackageOrSubpackage('safeds', {
nodeType: referenceType,
hideInternal: true,
});
}
}
5 changes: 4 additions & 1 deletion tests/resources/scoping/annotation calls/across files/main with qualified import.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tests.scoping.annotationCalls.acrossFiles

from safeds.scoping.annotationCalls.acrossFiles import MyAnnotation
from tests.scoping.annotationCalls.acrossFiles.other import AnnotationInAnotherPackage, Annotation2InAnotherPackage
from tests.scoping.annotationCalls.acrossFiles.other import AnnotationInAnotherPackage, Annotation2InAnotherPackage, NotAnAnnotation

// $TEST$ references safeds_MyAnnotation
@»MyAnnotation«
Expand All @@ -18,6 +18,9 @@ from tests.scoping.annotationCalls.acrossFiles.other import AnnotationInAnotherP
// $TEST$ references other_Annotation2InAnotherPackage
@»Annotation2InAnotherPackage«

// $TEST$ unresolved
@»NotAnAnnotation«

// $TEST$ unresolved
@»AnnotationWithoutPackage«
pipeline myPipeline {}
3 changes: 3 additions & 0 deletions tests/resources/scoping/annotation calls/across files/resource other package.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ annotation »AnnotationInAnotherPackage«

// $TEST$ target other_Annotation2InAnotherPackage
annotation »Annotation2InAnotherPackage«

// $TEST$ target other_NotAnAnnotation
class »NotAnAnnotation«
7 changes: 5 additions & 2 deletions ...ces/scoping/named types/across files/to global classes/main with qualified import.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tests.scoping.namedTypes.acrossFiles.toGlobalClasses

from safeds.scoping.namedTypes.acrossFiles.toGlobalClasses import MyClass
from tests.scoping.namedTypes.acrossFiles.toGlobalClasses.other import ClassInAnotherPackage, Class2InAnotherPackage
from tests.scoping.namedTypes.acrossFiles.toGlobalClasses.other import ClassInAnotherPackage, Class2InAnotherPackage, notANamedTypeDeclaration

segment mySegment(
// $TEST$ references safeds_MyClass
Expand All @@ -20,5 +20,8 @@ segment mySegment(
p5: »Class2InAnotherPackage«,

// $TEST$ unresolved
p6: »ClassWithoutPackage«,
p6: »notANamedTypeDeclaration«,

// $TEST$ unresolved
p7: »ClassWithoutPackage«,
) {}
3 changes: 3 additions & 0 deletions ...sources/scoping/named types/across files/to global classes/resource other package.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ class »ClassInAnotherPackage«

// $TEST$ target other_Class2InAnotherPackage
class »Class2InAnotherPackage«

// $TEST$ target other_notANamedTypeDeclaration
fun »notANamedTypeDeclaration«()
7 changes: 5 additions & 2 deletions ...urces/scoping/named types/across files/to global enums/main with qualified import.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tests.scoping.namedTypes.acrossFiles.toGlobalEnums

from safeds.scoping.namedTypes.acrossFiles.toGlobalEnums import MyEnum
from tests.scoping.namedTypes.acrossFiles.toGlobalEnums.other import EnumInAnotherPackage, Enum2InAnotherPackage
from tests.scoping.namedTypes.acrossFiles.toGlobalEnums.other import EnumInAnotherPackage, Enum2InAnotherPackage, notANamedTypeDeclaration

segment mySegment(
// $TEST$ references safeds_MyEnum
Expand All @@ -20,5 +20,8 @@ segment mySegment(
p5: »Enum2InAnotherPackage«,

// $TEST$ unresolved
p6: »EnumWithoutPackage«,
p6: »notANamedTypeDeclaration«,

// $TEST$ unresolved
p7: »EnumWithoutPackage«,
) {}
3 changes: 3 additions & 0 deletions ...resources/scoping/named types/across files/to global enums/resource other package.sdstest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ enum »EnumInAnotherPackage«

// $TEST$ target other_Enum2InAnotherPackage
enum »Enum2InAnotherPackage«

// $TEST$ target other_notANamedTypeDeclaration
fun »notANamedTypeDeclaration«()