fix after rebase

Signed-off-by: Jade Abraham <[email protected]>

tools/chplcheck/src/chplcheck.py

@@ -38,9 +38,7 @@
 
 def print_violation(loc: RuleLocation, name: str):
     first_line, _ = loc.start()
-    print(
-        "{}:{}: node violates rule {}".format(loc.path(), first_line, name)
-    )
+    print("{}:{}: node violates rule {}".format(loc.path(), first_line, name))
 
 
 def load_module(driver: LintDriver, file_path: str):

tools/chplcheck/src/driver.py

@@ -72,7 +72,9 @@ def rules_and_descriptions(self):
         # Use a dict in case a rule is registered multiple times.
         to_return = {}
 
-        for rule in itertools.chain(self.BasicRules, self.AdvancedRules, self.LocationRules):
+        for rule in itertools.chain(
+            self.BasicRules, self.AdvancedRules, self.LocationRules
+        ):
             to_return[rule.name] = rule.check_func.__doc__
 
         to_return = list(to_return.items())
@@ -139,7 +141,11 @@ def _check_rule(
         self,
         context: chapel.Context,
         root: chapel.AstNode,
-        rule: Union[rule_types.BasicRule, rule_types.AdvancedRule, rule_types.LocationRule],
+        rule: Union[
+            rule_types.BasicRule,
+            rule_types.AdvancedRule,
+            rule_types.LocationRule,
+        ],
     ) -> Iterator[rule_types.CheckResult]:
 
         # If we should ignore the rule no matter the node, no reason to run
@@ -193,7 +199,9 @@ def fixit(self, checkfunc):
 
         def decorator_fixit(func):
             found = False
-            for rule in itertools.chain(self.BasicRules, self.AdvancedRules, self.LocationRules):
+            for rule in itertools.chain(
+                self.BasicRules, self.AdvancedRules, self.LocationRules
+            ):
                 if rule.name == checkfunc.__name__:
                     rule.fixit_funcs.append(func)
                     found = True
@@ -253,7 +261,9 @@ def wrapper_advanced_rule(*args, **kwargs):
         else:
             return decorator_advanced_rule(_func)
 
-    def location_rule(self, _func=None, *, default=True, settings: List[str]=[]):
+    def location_rule(
+        self, _func=None, *, default=True, settings: List[str] = []
+    ):
         """
         This method is a decorator for adding location-only based rules to the
         driver. A location rule is a function that gets called on a filepath
@@ -296,7 +306,9 @@ def validate_rule_settings(self) -> List[str]:
         """
 
         all_rule_settings = set()
-        for rule in itertools.chain(self.BasicRules, self.AdvancedRules, self.LocationRules):
+        for rule in itertools.chain(
+            self.BasicRules, self.AdvancedRules, self.LocationRules
+        ):
             all_rule_settings.update(rule.settings)
 
         unrecognized_settings = []
@@ -315,10 +327,14 @@ def run_checks(
         """
 
         for ast in asts:
-            for rule in itertools.chain(self.BasicRules, self.AdvancedRules, self.LocationRules):
+            for rule in itertools.chain(
+                self.BasicRules, self.AdvancedRules, self.LocationRules
+            ):
                 for toreport in self._check_rule(context, ast, rule):
                     node = toreport[1]
-                    if node and self._has_internal_name(node):
+                    if not self.config.check_internal_prefixes and (
+                        not node or self.has_internal_prefix(node)
+                    ):
                         continue
 
                     yield toreport

tools/chplcheck/src/rule_types.py

@@ -39,6 +39,7 @@ def _build_ignore_fixit(
     ignore.description = "Ignore this warning"
     return ignore
 
+
 @dataclass
 class RuleLocation:
     path_: str
@@ -47,8 +48,10 @@ class RuleLocation:
 
     def path(self) -> str:
         return self.path_
+
     def start(self) -> typing.Tuple[int, int]:
         return self.start_
+
     def end(self) -> typing.Tuple[int, int]:
         return self.end_
 
@@ -188,7 +191,10 @@ def fixits(self, context: chapel.Context, name: str) -> typing.List[Fixit]:
         to_return = self._fixits
         return to_return
 
-_LocationRuleResult = typing.Iterator[typing.Union[RuleLocation, LocationRuleResult]]
+
+_LocationRuleResult = typing.Iterator[
+    typing.Union[RuleLocation, LocationRuleResult]
+]
 """Internal type for location rule results"""
 
 
@@ -198,11 +204,14 @@ def fixits(self, context: chapel.Context, name: str) -> typing.List[Fixit]:
 """Function type for location rules"""
 
 
-
-RuleResult = typing.Union[_BasicRuleResult, _AdvancedRuleResult, _LocationRuleResult]
+RuleResult = typing.Union[
+    _BasicRuleResult, _AdvancedRuleResult, _LocationRuleResult
+]
 """Union type for all rule results"""
 
-CheckResult = typing.Tuple[RuleLocation, typing.Optional[chapel.AstNode], str, typing.List[Fixit]]
+CheckResult = typing.Tuple[
+    RuleLocation, typing.Optional[chapel.AstNode], str, typing.List[Fixit]
+]
 
 
 VarResultType = typing.TypeVar("VarResultType")
@@ -386,13 +395,18 @@ def check(
             loc = RuleLocation.from_chapel(node.location())
             yield (loc, node, self.name, fixits)
 
+
 class LocationRule(Rule[LocationRuleResult]):
     """
     Class containing all information for the driver about advanced
     """
 
     def __init__(
-        self, driver, name: str, check_func: LocationRuleCheck, settings: typing.List[str]
+        self,
+        driver,
+        name: str,
+        check_func: LocationRuleCheck,
+        settings: typing.List[str],
     ) -> None:
         super().__init__(driver, name, settings)
         self.check_func = check_func

tools/chplcheck/src/rules.py

@@ -24,7 +24,12 @@
 from chapel import *
 from driver import LintDriver
 from fixits import Fixit, Edit
-from rule_types import BasicRuleResult, AdvancedRuleResult, LocationRuleResult, RuleLocation
+from rule_types import (
+    BasicRuleResult,
+    AdvancedRuleResult,
+    LocationRuleResult,
+    RuleLocation,
+)
 
 
 def variables(node: AstNode):
@@ -1041,14 +1046,14 @@ def FixMissingInIntent(context: Context, result: AdvancedRuleResult):
         return [fixit]
 
     @driver.location_rule(settings=[".Max"])
-    def LineLength(_: chapel.Context, path: str, lines: List[str], Max = None):
+    def LineLength(_: chapel.Context, path: str, lines: List[str], Max=None):
         """
         Warn for lines that exceed a maximum length.
 
         By default, the maximum line length is 80 characters.
         """
 
-        Max = Max or "80" # default to 80 characters
+        Max = Max or "80"  # default to 80 characters
         try:
             max_line_length = int(Max)
         except ValueError: