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.

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

Add AccessorProvider #807

Merged
merged 1 commit into from
Nov 10, 2022
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
2 changes: 2 additions & 0 deletions libcst/metadata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@


from libcst._position import CodePosition, CodeRange
from libcst.metadata.accessor_provider import AccessorProvider
from libcst.metadata.base_provider import (
BaseMetadataProvider,
BatchableMetadataProvider,
Expand Down Expand Up @@ -86,6 +87,7 @@
"Accesses",
"TypeInferenceProvider",
"FullRepoManager",
"AccessorProvider",
# Experimental APIs:
"ExperimentalReentrantCodegenProvider",
"CodegenPartial",
Expand Down
19 changes: 19 additions & 0 deletions libcst/metadata/accessor_provider.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.


import dataclasses

import libcst as cst

from libcst.metadata.base_provider import VisitorMetadataProvider


class AccessorProvider(VisitorMetadataProvider[str]):
def on_visit(self, node: cst.CSTNode) -> bool:
for f in dataclasses.fields(node):
child = getattr(node, f.name)
self.set_metadata(child, f.name)
return True
68 changes: 68 additions & 0 deletions libcst/metadata/tests/test_accessor_provider.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

import dataclasses

from textwrap import dedent

import libcst as cst
from libcst.metadata import AccessorProvider, MetadataWrapper
from libcst.testing.utils import data_provider, UnitTest


class DependentVisitor(cst.CSTVisitor):
METADATA_DEPENDENCIES = (AccessorProvider,)

def __init__(self, *, test: UnitTest) -> None:
self.test = test

def on_visit(self, node: cst.CSTNode) -> bool:
for f in dataclasses.fields(node):
child = getattr(node, f.name)
if type(child) is cst.CSTNode:
accessor = self.get_metadata(AccessorProvider, child)
self.test.assertEqual(accessor, f.name)
Comment on lines +22 to +26
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a very valuable test as it just duplicates the core logic. I suppose that's true for the parent metadata provider tests too

Copy link
Contributor Author

@matthewshaer matthewshaer Nov 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes - that is what I based this on - what would you suggest ? Should I serialise something like a tree of accessors and confirm it gets the right serialization ? (btw I have tested the logic works in a client application)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I serialise something like a tree of accessors and confirm it gets the right serialization ?

If you have the time, that would be great. No big deal if not.


return True


class AccessorProviderTest(UnitTest):
@data_provider(
(
(
"""
foo = 'toplevel'
fn1(foo)
fn2(foo)
def fn_def():
foo = 'shadow'
fn3(foo)
""",
),
(
"""
global_var = None
@cls_attr
class Cls(cls_attr, kwarg=cls_attr):
cls_attr = 5
def f():
pass
""",
),
(
"""
iterator = None
condition = None
[elt for target in iterator if condition]
{elt for target in iterator if condition}
{elt: target for target in iterator if condition}
(elt for target in iterator if condition)
""",
),
)
)
def test_accessor_provier(self, code: str) -> None:
wrapper = MetadataWrapper(cst.parse_module(dedent(code)))
wrapper.visit(DependentVisitor(test=self))