src/eric7/Plugins/PluginSyntaxChecker.py

branch
eric7
changeset 9925
a267ac36dd69
parent 9924
b41c9a7bcbbb
child 9955
aa02420279fe
--- a/src/eric7/Plugins/PluginSyntaxChecker.py	Mon Mar 20 10:43:29 2023 +0100
+++ b/src/eric7/Plugins/PluginSyntaxChecker.py	Mon Mar 20 16:08:35 2023 +0100
@@ -151,12 +151,13 @@
         """
         Private method to determine the syntax check options.
 
-        @return state of checkFlakes and ignoreStarImportWarnings (bool, bool)
+        @return tuple containing a flag indicating to perform a pyflakes check and
+            a flag indicating to ignore star import warnings
+        @rtype tuple of (bool, bool)
         """
         checkFlakes = Preferences.getFlakes("IncludeInSyntaxCheck")
         ignoreStarImportWarnings = Preferences.getFlakes("IgnoreStarImportWarnings")
-        additionalBuiltins = Preferences.getFlakes("AdditionalBuiltins")
-        return checkFlakes, ignoreStarImportWarnings, additionalBuiltins
+        return checkFlakes, ignoreStarImportWarnings
 
     def __translateSyntaxCheck(self, fn, problems):
         """
@@ -403,9 +404,20 @@
             SyntaxCheckerDialog,
         )
 
+        project = ericApp().getObject("Project")
         editor = ericApp().getObject("ViewManager").activeWindow()
         if editor is not None:
             self.__editorSyntaxCheckerDialog = SyntaxCheckerDialog()
+            if editor.isPy3File():
+                self.__editorSyntaxCheckerDialog.setArguments(
+                    (
+                        project.getData("CHECKERSPARMS", "SyntaxChecker", {}).get(
+                            "AdditionalBuiltins", []
+                        ),
+                    )
+                    if editor.isProjectFile()
+                    else (Preferences.getFlakes("AdditionalBuiltins"),)
+                )
             self.__editorSyntaxCheckerDialog.show()
             if editor.isJavascriptFile():
                 unnamed = "Unnamed.js"

eric ide

mercurial