From 8c28580e0ef9b3b764c65e25291423129101e2aa Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 14:57:30 +0100
Subject: [PATCH 01/12] feat: add code from python-analyzer repository

---
 .idea/.gitignore                              |   9 -
 .idea/.name                                   |   1 -
 .idea/codeStyles/Project.xml                  |  65 ---
 .idea/compiler.xml                            |   6 -
 .idea/gradle.xml                              |  19 +
 .idea/inspectionProfiles/Project_Default.xml  |   1 +
 .idea/jarRepositories.xml                     |   5 -
 .idea/jsLinters/eslint.xml                    |   6 -
 .idea/kotlinc.xml                             |   6 +
 .idea/misc.xml                                |   5 +
 .idea/modules.xml                             |   9 +
 .idea/modules/com.larsreimann.api_editor.iml  |   8 -
 .idea/prettier.xml                            |   8 -
 .idea/runConfigurations/All_Tests.xml         |  21 -
 .idea/runConfigurations/Backend_server.xml    |  21 -
 .idea/runConfigurations/Build.xml             |  21 -
 .idea/runConfigurations/Clean.xml             |  21 -
 .idea/runConfigurations/Server_tests.xml      |  21 -
 .idea/workspace.xml                           | 102 +++++
 package-parser/README.md                      |  79 +++-
 package-parser/package-parser.iml             |  14 +
 package-parser/package_parser/cli.py          | 106 ++++-
 .../commands/find_usages/__init__.py          |   2 +
 .../commands/find_usages/_ast_visitor.py      | 120 +++++
 .../commands/find_usages/_find_usages.py      |  97 ++++
 .../commands/find_usages/_model.py            | 343 +++++++++++++++
 .../commands/suggest_improvements/__init__.py |   1 +
 .../__old_call_and_parameter_counter.py       | 413 ++++++++++++++++++
 .../_suggest_improvements.py                  | 345 +++++++++++++++
 29 files changed, 1655 insertions(+), 220 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/compiler.xml
 create mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/jsLinters/eslint.xml
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 delete mode 100644 .idea/modules/com.larsreimann.api_editor.iml
 delete mode 100644 .idea/prettier.xml
 delete mode 100644 .idea/runConfigurations/All_Tests.xml
 delete mode 100644 .idea/runConfigurations/Backend_server.xml
 delete mode 100644 .idea/runConfigurations/Build.xml
 delete mode 100644 .idea/runConfigurations/Clean.xml
 delete mode 100644 .idea/runConfigurations/Server_tests.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 package-parser/package-parser.iml
 create mode 100644 package-parser/package_parser/commands/find_usages/__init__.py
 create mode 100644 package-parser/package_parser/commands/find_usages/_ast_visitor.py
 create mode 100644 package-parser/package_parser/commands/find_usages/_find_usages.py
 create mode 100644 package-parser/package_parser/commands/find_usages/_model.py
 create mode 100644 package-parser/package_parser/commands/suggest_improvements/__init__.py
 create mode 100644 package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py
 create mode 100644 package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 211cb9a1a..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default ignored files
-/shelf/
-gradle.xml
-misc.xml
-uidesigner.xml
-workspace.xml
-
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 9a7dd5a65..000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-com.larsreimann.api_editor
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 68913f846..000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="80" />
-    <option name="SOFT_MARGINS" value="80" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_QUOTE_STYLE" value="Single" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-      <option name="IMPORT_SORT_MODULE_NAME" value="true" />
-    </JSCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-      <option name="IMPORT_SORT_MODULE_NAME" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="120" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="120" />
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="120" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8a4..000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 000000000..7dfb811d1
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/api-editor" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$/api-editor" />
+            <option value="$PROJECT_DIR$/api-editor/client" />
+            <option value="$PROJECT_DIR$/api-editor/server" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 03d9549ea..cce1d8640 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,5 +2,6 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyInterpreterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e824b9229..fdc392fe8 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,10 +16,5 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://packages.jetbrains.team/maven/p/ij/intellij-dependencies" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml
deleted file mode 100644
index 541945bb0..000000000
--- a/.idea/jsLinters/eslint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EslintConfiguration">
-    <option name="fix-on-save" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 000000000..dff65d563
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.5.10-release-958" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..09adcc7f2
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="Gradle 17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..42a8ebce1
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/api-editor.iml" filepath="$PROJECT_DIR$/.idea/api-editor.iml" />
+      <module fileurl="file://$PROJECT_DIR$/package-parser/package-parser.iml" filepath="$PROJECT_DIR$/package-parser/package-parser.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/com.larsreimann.api_editor.iml b/.idea/modules/com.larsreimann.api_editor.iml
deleted file mode 100644
index 84be173a4..000000000
--- a/.idea/modules/com.larsreimann.api_editor.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Python" name="Python">
-      <configuration sdkName="Poetry (api-editor)" />
-    </facet>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
deleted file mode 100644
index 0cc0b423e..000000000
--- a/.idea/prettier.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myRunOnSave" value="true" />
-    <option name="myRunOnReformat" value="true" />
-    <option name="myFilesPattern" value="{**/*,*}.{html,md,css,js,jsx,ts,tsx,json,yaml,yml}" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
deleted file mode 100644
index c3c93d70b..000000000
--- a/.idea/runConfigurations/All_Tests.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="check" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Backend_server.xml b/.idea/runConfigurations/Backend_server.xml
deleted file mode 100644
index dc7f47109..000000000
--- a/.idea/runConfigurations/Backend_server.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Backend server" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="run" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build.xml
deleted file mode 100644
index 1aaf652fc..000000000
--- a/.idea/runConfigurations/Build.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="build" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Clean.xml b/.idea/runConfigurations/Clean.xml
deleted file mode 100644
index 4c57fcfff..000000000
--- a/.idea/runConfigurations/Clean.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clean" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="clean" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Server_tests.xml b/.idea/runConfigurations/Server_tests.xml
deleted file mode 100644
index 211931538..000000000
--- a/.idea/runConfigurations/Server_tests.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server tests" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value=":server:test --tests *" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..15f3fcef9
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="ac142c8f-0c12-411c-b603-83c24ca369d9" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_ast_visitor.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_find_usages.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_model.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/suggest_improvements/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/api-editor.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/api-editor.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jsLinters/eslint.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules/com.larsreimann.api_editor.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/prettier.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Backend_server.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Build.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Clean.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Server_tests.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-parser/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-parser/package_parser/cli.py" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/package_parser/cli.py" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$/api-editor">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand />
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="24vAQZPswFATMaoODo6b9bviJg1" />
+  <component name="ProjectViewState">
+    <option name="compactDirectories" value="true" />
+    <option name="flattenModules" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="false" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showModules" value="false" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Modules",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.2"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="ac142c8f-0c12-411c-b603-83c24ca369d9" name="Changes" comment="" />
+      <created>1644500673135</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1644500673135</updated>
+      <workItem from="1644500675625" duration="488000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+    <option name="exactExcludedFiles">
+      <list>
+        <option value="$PROJECT_DIR$/api-editor/client/src/theme/index.d.ts" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/package-parser/README.md b/package-parser/README.md
index a38600ab3..7275151ff 100644
--- a/package-parser/README.md
+++ b/package-parser/README.md
@@ -1,13 +1,84 @@
-# Execution of Starter Code
+# library-analyzer
+
+A tool to analyzer client and API code written in Python.
+
+## Usage
+
+```text
+usage: parse-package [-h] {api,usages,improve} ...
+
+Analyze Python code.
+
+positional arguments:
+  {api,usages,improve}
+    api                 List the API of a package.
+    usages              Find usages of API elements.
+    improve             Suggest how to improve an existing API.
+
+optional arguments:
+  -h, --help            show this help message and exit
+```
+
+### api command
+
+```text
+usage: parse-package api [-h] -p PACKAGE -o OUT
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -p PACKAGE, --package PACKAGE
+                        The name of the package. It must be installed in the current interpreter.
+  -o OUT, --out OUT     Output directory.
+```
+
+### usages command
+
+```text
+usage: parse-package usages [-h] -p PACKAGE -s SRC -t TMP -o OUT
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -p PACKAGE, --package PACKAGE
+                        The name of the package. It must be installed in the current interpreter.
+  -s SRC, --src SRC     Directory containing Python code.
+  -t TMP, --tmp TMP     Directory where temporary files can be stored (to save progress in case the program crashes).
+  -o OUT, --out OUT     Output directory.
+```
+
+### improve command
+
+```text
+usage: parse-package improve [-h] -a API -u USAGES -o OUT [-m MIN]
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -a API, --api API     File created by the 'api' command.
+  -u USAGES, --usages USAGES
+                        File created by the 'usages' command.
+  -o OUT, --out OUT     Output directory.
+  -m MIN, --min MIN     Minimum number of usages required to keep an API element.
+```
+
+### Example usage
 
 1. Install Python 3.9.
-2. Install [poetry](https://python-poetry.org/docs/master/#installation).
-3. **Only the first time**, install dependencies:
+1. Install [poetry](https://python-poetry.org/docs/master/#installation).
+1. **Only the first time**, install dependencies:
     ```shell
     poetry install
     ```
-4. Run the tool:
+1. Create a shell with poetry:
     ```shell
     poetry shell
+    ```
+1. Run the commands described above:
+    ```shell
+    # Step 1:
     parse-package api -p sklearn -o out
+
+    # Step 2:
+    parse-package usages -p sklearn -s "Kaggle Kernels" -t tmp -o out
+
+    # Step 3:
+    parse-package improve -a "out/scikit-learn__sklearn__1.0__api.json" -u "out/scikit-learn__sklearn__1.0__usages.json" -o out
     ```
diff --git a/package-parser/package-parser.iml b/package-parser/package-parser.iml
new file mode 100644
index 000000000..904bf2ca5
--- /dev/null
+++ b/package-parser/package-parser.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/package_parser" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/purity_group_Prototype" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/refined_types" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="Poetry (api-editor)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/package-parser/package_parser/cli.py b/package-parser/package_parser/cli.py
index d65a6014f..c0fe9943a 100644
--- a/package-parser/package_parser/cli.py
+++ b/package-parser/package_parser/cli.py
@@ -4,11 +4,15 @@
 from pathlib import Path
 from typing import Any
 
-from .commands.get_api import get_api
+from .commands.find_usages import find_usages
+from .commands.get_api import distribution, distribution_version, get_api
 from .commands.get_dependencies import get_dependencies
+from .commands.suggest_improvements import suggest_improvements
 from .utils import ensure_file_exists
 
 __API_COMMAND = "api"
+__USAGES_COMMAND = "usages"
+__IMPROVE_COMMAND = "improve"
 
 
 class CustomEncoder(json.JSONEncoder):
@@ -38,6 +42,22 @@ def cli() -> None:
         with out_file_api_dependencies.open("w") as f:
             json.dump(public_api_dependencies.to_json(), f, indent=2, cls=CustomEncoder)
 
+    elif args.command == __USAGES_COMMAND:
+        usages = find_usages(args.package, args.src, args.tmp)
+
+        dist = distribution(args.package)
+
+        out_dir: Path = args.out
+        out_file = out_dir.joinpath(
+            f"{dist}__{args.package}__{distribution_version(dist)}__usages.json"
+        )
+        ensure_file_exists(out_file)
+        with out_file.open("w") as f:
+            json.dump(usages.to_json(), f, indent=2)
+
+    elif args.command == __IMPROVE_COMMAND:
+        suggest_improvements(args.api, args.usages, args.out, args.min)
+
 
 def __get_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Analyze Python code.")
@@ -45,12 +65,17 @@ def __get_args() -> argparse.Namespace:
     # Commands
     subparsers = parser.add_subparsers(dest="command")
     __add_api_subparser(subparsers)
+    __add_usages_subparser(subparsers)
+    __add_improve_subparser(subparsers)
 
     return parser.parse_args()
 
 
 def __add_api_subparser(subparsers: _SubParsersAction) -> None:
-    api_parser = subparsers.add_parser(__API_COMMAND, help="List the API of a package.")
+    api_parser = subparsers.add_parser(
+        __API_COMMAND,
+        help="List the API of a package."
+    )
     api_parser.add_argument(
         "-p",
         "--package",
@@ -59,5 +84,80 @@ def __add_api_subparser(subparsers: _SubParsersAction) -> None:
         required=True,
     )
     api_parser.add_argument(
-        "-o", "--out", help="Output directory.", type=Path, required=True
+        "-o",
+        "--out",
+        help="Output directory.",
+        type=Path,
+        required=True
+    )
+
+
+def __add_usages_subparser(subparsers: _SubParsersAction) -> None:
+    usages_parser = subparsers.add_parser(
+        __USAGES_COMMAND,
+        help="Find usages of API elements."
+    )
+    usages_parser.add_argument(
+        "-p",
+        "--package",
+        help="The name of the package. It must be installed in the current interpreter.",
+        type=str,
+        required=True,
+    )
+    usages_parser.add_argument(
+        "-s",
+        "--src",
+        help="Directory containing Python code.",
+        type=Path,
+        required=True,
+    )
+    usages_parser.add_argument(
+        "-t",
+        "--tmp",
+        help="Directory where temporary files can be stored (to save progress in case the program crashes).",
+        type=Path,
+        required=True,
+    )
+    usages_parser.add_argument(
+        "-o",
+        "--out",
+        help="Output directory.",
+        type=Path,
+        required=True
+    )
+
+
+def __add_improve_subparser(subparsers: _SubParsersAction) -> None:
+    improve_parser = subparsers.add_parser(
+        __IMPROVE_COMMAND,
+        help="Suggest how to improve an existing API."
+    )
+    improve_parser.add_argument(
+        "-a",
+        "--api",
+        help="File created by the 'api' command.",
+        type=argparse.FileType('r'),
+        required=True,
+    )
+    improve_parser.add_argument(
+        "-u",
+        "--usages",
+        help="File created by the 'usages' command.",
+        type=argparse.FileType('r'),
+        required=True,
+    )
+    improve_parser.add_argument(
+        "-o",
+        "--out",
+        help="Output directory.",
+        type=Path,
+        required=True
+    )
+    improve_parser.add_argument(
+        "-m",
+        "--min",
+        help="Minimum number of usages required to keep an API element.",
+        type=int,
+        required=False,
+        default=1
     )
diff --git a/package-parser/package_parser/commands/find_usages/__init__.py b/package-parser/package_parser/commands/find_usages/__init__.py
new file mode 100644
index 000000000..19fe34c88
--- /dev/null
+++ b/package-parser/package_parser/commands/find_usages/__init__.py
@@ -0,0 +1,2 @@
+from ._find_usages import find_usages
+from ._model import UsageStore, Usage
diff --git a/package-parser/package_parser/commands/find_usages/_ast_visitor.py b/package-parser/package_parser/commands/find_usages/_ast_visitor.py
new file mode 100644
index 000000000..ba1984c14
--- /dev/null
+++ b/package-parser/package_parser/commands/find_usages/_ast_visitor.py
@@ -0,0 +1,120 @@
+from typing import Optional
+
+import astroid
+from astroid.arguments import CallSite
+from astroid.helpers import safe_infer
+
+from ._model import UsageStore, Location
+
+
+class _UsageFinder:
+    def __init__(self, package_name: str, python_file: str) -> None:
+        self.package_name: str = package_name
+        self.python_file: str = python_file
+        self.usages: UsageStore = UsageStore()
+
+    def enter_call(self, node: astroid.Call):
+        called_tuple = _analyze_declaration_called_by(node, self.package_name)
+        if called_tuple is None:
+            return
+        called, function_qname, parameters, n_implicit_parameters = called_tuple
+
+        bound_parameters = _bound_parameters(
+            parameters,
+            CallSite.from_call(node),
+            n_implicit_parameters
+        )
+        if bound_parameters is None:
+            return
+
+        location = Location(self.python_file, node.lineno, node.col_offset)
+
+        # Add class usage
+        if isinstance(called, (astroid.BoundMethod, astroid.UnboundMethod)) or \
+            isinstance(called, astroid.FunctionDef) and called.is_method():
+            self.usages.add_class_usage(".".join(function_qname.split(".")[:-1]), location)
+
+        # Add function usage
+        self.usages.add_function_usage(function_qname, location)
+
+        # Add parameter & value usage
+        for parameter_name, value in bound_parameters.items():
+            parameter_qname = f"{function_qname}.{parameter_name}"
+            self.usages.add_parameter_usage(parameter_qname, location)
+
+            value = _stringify_value(value)
+            self.usages.add_value_usage(parameter_qname, value, location)
+
+
+def _analyze_declaration_called_by(node: astroid.Call, package_name: str) -> Optional[
+    tuple[astroid.NodeNG, str, astroid.Arguments, int]]:
+    """
+    Returns None if the called declaration could not be determined or if it is not relevant for us. Otherwise, it
+    returns a tuple with the form (called, qualified_name, parameters, n_implicit_parameters).
+    """
+
+    called = safe_infer(node.func)
+    if called is None or not __is_relevant_qualified_name(
+        package_name,
+        called.qname()
+    ):
+        return None
+
+    n_implicit_parameters = __n_implicit_parameters(called)
+
+    if isinstance(called, astroid.ClassDef):
+        called = __called_constructor(called)
+        if called is None:
+            return None
+
+    if isinstance(called, (astroid.BoundMethod, astroid.UnboundMethod, astroid.FunctionDef)):
+        return called, called.qname(), called.args, n_implicit_parameters
+    else:
+        return None
+
+
+def __is_relevant_qualified_name(package_name: str, qualified_name: str) -> bool:
+    return qualified_name.startswith(package_name)
+
+
+def __n_implicit_parameters(called: astroid.NodeNG) -> int:
+    return called.implicit_parameters() if hasattr(called, "implicit_parameters") else 0
+
+
+def __called_constructor(class_def: astroid.ClassDef) -> Optional[astroid.FunctionDef]:
+    try:
+        # Use last __init__
+        constructor = class_def.local_attr("__init__")[-1]
+    except astroid.NotFoundError:
+        return None
+
+    if isinstance(constructor, astroid.FunctionDef):
+        return constructor
+    else:
+        return None
+
+
+def _stringify_value(value: astroid.NodeNG):
+    return value.as_string()
+
+
+def _bound_parameters(
+    parameters: astroid.Arguments,
+    arguments: CallSite,
+    n_implicit_parameters: int
+) -> Optional[dict[str, astroid.NodeNG]]:
+    # Improper call
+    if parameters.args is None or arguments.has_invalid_arguments() or arguments.has_invalid_keywords():
+        return None
+
+    result: dict[str, astroid.NodeNG] = arguments.keyword_arguments.copy()
+
+    positional_parameter_names = [it.name for it in (parameters.posonlyargs + parameters.args)][n_implicit_parameters:]
+
+    for index, arg in enumerate(arguments.positional_arguments):
+        if index >= len(positional_parameter_names):
+            break
+
+        result[positional_parameter_names[index]] = arg
+
+    return result
diff --git a/package-parser/package_parser/commands/find_usages/_find_usages.py b/package-parser/package_parser/commands/find_usages/_find_usages.py
new file mode 100644
index 000000000..fcd9fbde1
--- /dev/null
+++ b/package-parser/package_parser/commands/find_usages/_find_usages.py
@@ -0,0 +1,97 @@
+import json
+import multiprocessing
+from pathlib import Path
+
+import astroid
+
+from package_parser.utils import initialize_and_read_exclude_file, list_files, ASTWalker
+from ._ast_visitor import _UsageFinder
+from ._model import UsageStore
+
+__N_PROCESSES = 12
+
+
+def find_usages(package_name: str, src_dir: Path, tmp_dir: Path):
+    candidate_python_files = list_files(src_dir, ".py")
+
+    exclude_file = tmp_dir.joinpath("$$$$$exclude$$$$$.txt")
+    excluded_python_files = set(initialize_and_read_exclude_file(exclude_file))
+
+    python_files = [it for it in candidate_python_files if it not in excluded_python_files]
+
+    tmp_dir.mkdir(parents=True, exist_ok=True)
+
+    lock = multiprocessing.Lock()
+    with multiprocessing.Pool(
+        processes=__N_PROCESSES,
+        initializer=__initialize_process_environment,
+        initargs=(lock,)
+    ) as pool:
+        pool.starmap(
+            __find_usages_in_single_file,
+            [[package_name, it, exclude_file, tmp_dir] for it in python_files]
+        )
+    pool.join()
+    pool.close()
+
+    return _merge_results(tmp_dir)
+
+
+def __initialize_process_environment(lock: multiprocessing.Lock):
+    # noinspection PyGlobalUndefined
+    global _lock
+    _lock = lock
+
+
+def __find_usages_in_single_file(
+    package_name: str,
+    python_file: str,
+    exclude_file: Path,
+    tmp_dir: Path,
+):
+    print(f"Working on {python_file}")
+
+    try:
+        with open(python_file, "r") as f:
+            source = f.read()
+
+        if __is_relevant_python_file(package_name, source):
+            usage_finder = _UsageFinder(package_name, python_file)
+            ASTWalker(usage_finder).walk(astroid.parse(source))
+
+            tmp_file = tmp_dir.joinpath(
+                python_file.replace("/", "__").replace("\\", "__").replace(".py", ".json")
+            )
+            with tmp_file.open("w") as f:
+                json.dump(usage_finder.usages.to_json(), f, indent=2)
+        else:
+            print(f"Skipping {python_file} (irrelevant file)")
+
+    except UnicodeError:
+        print(f"Skipping {python_file} (broken encoding)")
+    except astroid.exceptions.AstroidSyntaxError:
+        print(f"Skipping {python_file} (invalid syntax)")
+    except RecursionError:
+        print(f"Skipping {python_file} (infinite recursion)")
+
+    with _lock:
+        with exclude_file.open("a") as f:
+            f.write(f"{python_file}\n")
+
+
+def __is_relevant_python_file(package_name: str, source_code: str) -> bool:
+    return package_name in source_code
+
+
+def _merge_results(tmp_dir: Path) -> UsageStore:
+    result = UsageStore()
+
+    files = list_files(tmp_dir, ".json")
+    for index, file in enumerate(files):
+        print(f"Merging {file} ({index + 1}/{len(files)})")
+
+        with open(file, "r") as f:
+            other_usage_store = UsageStore.from_json(json.load(f))
+            result.merge_other_into_self(other_usage_store)
+
+    return result
diff --git a/package-parser/package_parser/commands/find_usages/_model.py b/package-parser/package_parser/commands/find_usages/_model.py
new file mode 100644
index 000000000..2d3a72c6c
--- /dev/null
+++ b/package-parser/package_parser/commands/find_usages/_model.py
@@ -0,0 +1,343 @@
+from __future__ import annotations
+
+from typing import Any, Optional
+
+ClassQName = str
+FunctionQName = str
+ParameterQName = str
+StringifiedValue = str
+
+
+class UsageStore:
+
+    @staticmethod
+    def from_json(json: Any) -> UsageStore:
+        result = UsageStore()
+
+        # Revive class usages
+        class_usages = json["class_usages"]
+        for qname, locations in class_usages.items():
+            for location in locations:
+                result.add_class_usage(qname, Location.from_json(location))
+
+        # Revive function usages
+        function_usages = json["function_usages"]
+        for qname, locations in function_usages.items():
+            for location in locations:
+                result.add_function_usage(qname, Location.from_json(location))
+
+        # Revive parameter usages
+        parameter_usages = json["parameter_usages"]
+        for qname, locations in parameter_usages.items():
+            for location in locations:
+                result.add_parameter_usage(qname, Location.from_json(location))
+
+        # Revive value usages
+        value_usages = json["value_usages"]
+        for parameter_qname, values in value_usages.items():
+            for value, locations in values.items():
+                for location in locations:
+                    result.add_value_usage(parameter_qname, value, Location.from_json(location))
+
+        return result
+
+    def __init__(self) -> None:
+        self.class_usages: dict[ClassQName, list[ClassUsage]] = {}
+        self.function_usages: dict[FunctionQName, list[FunctionUsage]] = {}
+        self.parameter_usages: dict[ParameterQName, list[ParameterUsage]] = {}
+        self.value_usages: dict[ParameterQName, dict[StringifiedValue, list[ValueUsage]]] = {}
+
+    def add_class_usage(self, qname: ClassQName, location: Location) -> None:
+        self.init_class(qname)
+        self.class_usages[qname].append(ClassUsage(qname, location))
+
+    def init_class(self, qname: ClassQName) -> None:
+        if qname not in self.class_usages:
+            self.class_usages[qname] = []
+
+    def remove_class(self, class_qname: ClassQName) -> None:
+        if class_qname in self.class_usages:
+            del self.class_usages[class_qname]
+
+        for function_qname in list(self.function_usages.keys()):
+            if function_qname.startswith(class_qname):
+                self.remove_function(function_qname)
+
+    def add_function_usage(self, qname: FunctionQName, location: Location) -> None:
+        self.init_function(qname)
+        self.function_usages[qname].append(FunctionUsage(qname, location))
+
+    def init_function(self, qname: FunctionQName) -> None:
+        if qname not in self.function_usages:
+            self.function_usages[qname] = []
+
+    def remove_function(self, function_qname: FunctionQName) -> None:
+        if function_qname in self.function_usages:
+            del self.function_usages[function_qname]
+
+        for parameter_qname in list(self.parameter_usages.keys()):
+            if parameter_qname.startswith(function_qname):
+                self.remove_parameter(parameter_qname)
+
+    def add_parameter_usage(self, qname: ParameterQName, location: Location) -> None:
+        self.init_parameter(qname)
+        self.parameter_usages[qname].append(ParameterUsage(qname, location))
+
+    def init_parameter(self, qname: ParameterQName) -> None:
+        if qname not in self.parameter_usages:
+            self.parameter_usages[qname] = []
+
+    def remove_parameter(self, qname: ParameterQName) -> None:
+        if qname in self.parameter_usages:
+            del self.parameter_usages[qname]
+
+        self.remove_value(qname)
+
+    def add_value_usage(self, parameter_qname: ParameterQName, value: StringifiedValue, location: Location) -> None:
+        self.init_value(parameter_qname)
+
+        if value not in self.value_usages[parameter_qname]:
+            self.value_usages[parameter_qname][value] = []
+
+        self.value_usages[parameter_qname][value].append(ValueUsage(parameter_qname, value, location))
+
+    def init_value(self, parameter_qname: ParameterQName) -> None:
+        if parameter_qname not in self.value_usages:
+            self.value_usages[parameter_qname] = {}
+
+    def remove_value(self, qname: ParameterQName) -> None:
+        if qname in self.value_usages:
+            del self.value_usages[qname]
+
+    def n_class_usages(self, qname: ClassQName) -> int:
+        if qname in self.class_usages:
+            return len(self.class_usages[qname])
+
+        return 0
+
+    def n_function_usages(self, qname: FunctionQName) -> int:
+        if qname in self.function_usages:
+            return len(self.function_usages[qname])
+
+        return 0
+
+    def n_parameter_usages(self, qname: ParameterQName) -> int:
+        if qname in self.parameter_usages:
+            return len(self.parameter_usages[qname])
+
+        return 0
+
+    def n_value_usages(self, qname: ParameterQName, value: str) -> int:
+        if qname in self.value_usages and value in self.value_usages[qname]:
+            return len(self.value_usages[qname][value])
+
+        return 0
+
+    def most_common_value(self, qname: ParameterQName) -> Optional[str]:
+        if qname not in self.value_usages:
+            return None
+
+        result = None
+        count = 0
+
+        for value, usages in self.value_usages[qname].items():
+            if len(usages) > count:
+                result = value
+                count = len(usages)
+
+        return result
+
+    def merge_other_into_self(self, other_usage_store: UsageStore) -> UsageStore:
+        """
+        Merges the other usage store into this one **in-place** and returns this store.
+
+        :param other_usage_store: The usage store to merge into this one.
+        :return: This usage store.
+        """
+
+        # Merge class usages
+        for usages in other_usage_store.class_usages.values():
+            for usage in usages:
+                self.add_class_usage(usage.qname, usage.location)
+
+        # Merge function usages
+        for usages in other_usage_store.function_usages.values():
+            for usage in usages:
+                self.add_function_usage(usage.qname, usage.location)
+
+        # Merge parameter usages
+        for usages in other_usage_store.parameter_usages.values():
+            for usage in usages:
+                self.add_parameter_usage(usage.qname, usage.location)
+
+        # Merge value usages
+        for values in other_usage_store.value_usages.values():
+            for usages in values.values():
+                for usage in usages:
+                    self.add_value_usage(usage.parameter_qname, usage.value, usage.location)
+
+        return self
+
+    def to_json(self) -> Any:
+        return {
+            "class_usages": {
+                qname: [
+                    usage.location.to_json()
+                    for usage in usages
+                ]
+                for qname, usages in self.class_usages.items()
+            },
+            "function_usages": {
+                qname: [
+                    usage.location.to_json()
+                    for usage in usages
+                ]
+                for qname, usages in self.function_usages.items()
+            },
+            "parameter_usages": {
+                qname: [
+                    usage.location.to_json()
+                    for usage in usages
+                ]
+                for qname, usages in self.parameter_usages.items()
+            },
+            "value_usages": {
+                parameter_qname: {
+                    value: [
+                        usage.location.to_json()
+                        for usage in usages
+                    ]
+                    for value, usages in values.items()
+                }
+                for parameter_qname, values in self.value_usages.items()
+            },
+        }
+
+    def to_count_json(self) -> Any:
+        return {
+            "class_counts": {
+                qname: len(usages)
+                for qname, usages in sorted(
+                    self.class_usages.items(),
+                    key=lambda item: len(item[1]),
+                    reverse=True
+                )
+            },
+            "function_counts": {
+                qname: len(usages)
+                for qname, usages in sorted(
+                    self.function_usages.items(),
+                    key=lambda item: len(item[1]),
+                    reverse=True
+                )
+            },
+            "parameter_counts": {
+                qname: len(usages)
+                for qname, usages in sorted(
+                    self.parameter_usages.items(),
+                    key=lambda item: len(item[1]),
+                    reverse=True
+                )
+            },
+            "value_counts": {
+                parameter_qname: {
+                    value: len(usages)
+                    for value, usages in sorted(
+                        values.items(),
+                        key=lambda item: len(item[1]),
+                        reverse=True
+                    )
+                }
+                for parameter_qname, values in self.value_usages.items()
+            }
+        }
+
+class Usage:
+    pass
+
+class ClassUsage(Usage):
+    def __init__(self, qname: ClassQName, location: Location) -> None:
+        self.qname: ClassQName = qname
+        self.location: Location = location
+
+    def to_json(self) -> Any:
+        return {
+            "qname": self.qname,
+            "location": self.location.to_json()
+        }
+
+
+class FunctionUsage(Usage):
+    def __init__(self, qname: FunctionQName, location: Location) -> None:
+        self.qname: FunctionQName = qname
+        self.location: Location = location
+
+    def to_json(self) -> Any:
+        return {
+            "qname": self.qname,
+            "location": self.location.to_json()
+        }
+
+
+class ParameterUsage(Usage):
+    def __init__(self, qname: ParameterQName, location: Location) -> None:
+        self.qname: ParameterQName = qname
+        self.location: Location = location
+
+    def to_json(self) -> Any:
+        return {
+            "qname": self.qname,
+            "location": self.location.to_json()
+        }
+
+
+class ValueUsage(Usage):
+    def __init__(self, parameter_qname: ParameterQName, value: StringifiedValue, location: Location) -> None:
+        self.parameter_qname: ParameterQName = parameter_qname
+        self.value: StringifiedValue = value
+        self.location: Location = location
+
+    def to_json(self) -> Any:
+        return {
+            "parameter_qname": self.parameter_qname,
+            "value": self.value,
+            "location": self.location.to_json()
+        }
+
+
+FileName = str
+LineNumber = int
+ColumnNumber = int
+
+
+class Location:
+
+    @staticmethod
+    def from_json(json: Any) -> Location:
+        return Location(
+            json["file"],
+            json["line"],
+            json["column"]
+        )
+
+    def __init__(self, file: FileName, line: Optional[LineNumber], column: Optional[ColumnNumber]) -> None:
+        self.file: FileName = file
+        self.line: Optional[LineNumber] = line
+        self.column: Optional[ColumnNumber] = column
+
+    def __repr__(self) -> str:
+        return f"{self.file}@{self.line}:{self.column}"
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, type(self)): return NotImplemented
+        return self.file == other.file and self.line == other.line and self.column == other.column
+
+    def __hash__(self) -> int:
+        return hash((self.file, self.line, self.column))
+
+    def to_json(self) -> Any:
+        return {
+            "file": self.file,
+            "line": self.line,
+            "column": self.column
+        }
diff --git a/package-parser/package_parser/commands/suggest_improvements/__init__.py b/package-parser/package_parser/commands/suggest_improvements/__init__.py
new file mode 100644
index 000000000..e1c2d5ae0
--- /dev/null
+++ b/package-parser/package_parser/commands/suggest_improvements/__init__.py
@@ -0,0 +1 @@
+from ._suggest_improvements import suggest_improvements
diff --git a/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py b/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py
new file mode 100644
index 000000000..f87a85fa7
--- /dev/null
+++ b/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py
@@ -0,0 +1,413 @@
+import json
+from pathlib import Path
+from typing import Optional, Any
+
+from package_parser.commands.get_api import get_api
+from package_parser.utils import list_files
+
+# Type aliases
+ClassName = str
+CallableName = str
+ParameterName = str
+StringifiedValue = str
+FileName = str
+LineNumber = int
+ColumnNumber = int
+Occurrence = tuple[FileName, Optional[LineNumber], Optional[ColumnNumber]]
+ClassStore = dict[ClassName, list[Occurrence]]
+CallStore = dict[CallableName, list[Occurrence]]
+ParameterStore = dict[CallableName, dict[ParameterName, list[Occurrence]]]
+ValueStore = dict[CallableName, dict[ParameterName, dict[str, Any]]]
+
+# Global values
+_relevant_packages = {
+    "sklearn",
+}
+
+
+# TODO: step 1: add_implicit_default_values
+
+def _merge_results(out_dir: Path) -> tuple[ClassStore, CallStore, ParameterStore, ValueStore]:
+    result_classes: ClassStore = {}
+    result_calls: CallStore = {}
+    result_parameters: ParameterStore = {}
+    result_values: ValueStore = {}
+
+    # Include all callables and parameters (and their default values) from relevant packages
+    for package_name in _relevant_packages:
+        callables, classes = get_api(package_name)
+
+        for callable_name, parameters in callables.items():
+            result_calls[callable_name] = []
+            result_parameters[callable_name] = {}
+            result_values[callable_name] = {}
+
+            for parameter_name, default_value in parameters.items():
+                result_parameters[callable_name][parameter_name] = []
+                result_values[callable_name][parameter_name] = {
+                    "defaultValue": default_value,
+                    "values": {}
+                }
+
+        for class_name in classes:
+            result_classes[class_name] = []
+
+    files = list_files(out_dir, ".json")
+    for index, file in enumerate(files):
+        if "$$$$$merged" in file:
+            continue  # this is an output of this process
+
+        print(f"Merging {file} ({index + 1}/{len(files)})")
+
+        with open(file, "r") as f:
+            content = json.load(f)
+
+        # merge calls
+        call_store: CallStore = content["calls"]
+        for callable_name, occurrences in call_store.items():
+            if callable_name not in result_calls:
+                # not part of the public API
+                continue
+
+            result_calls[callable_name].extend(occurrences)
+
+        # merge parameters
+        parameter_store: ParameterStore = content["parameters"]
+        for callable_name, parameters in parameter_store.items():
+            if callable_name not in result_parameters:
+                result_parameters[callable_name] = {}
+
+            for parameter_name, occurrences in parameters.items():
+                if parameter_name not in result_parameters[callable_name]:
+                    result_parameters[callable_name][parameter_name] = []
+
+                result_parameters[callable_name][parameter_name].extend(occurrences)
+
+        # merge values
+        value_store: ValueStore = content["values"]
+        for callable_name, parameters in value_store.items():
+            if callable_name not in result_values:
+                result_values[callable_name] = {}
+
+            for parameter_name, values in parameters.items():
+                if parameter_name not in result_values[callable_name]:
+                    result_values[callable_name][parameter_name] = {
+                        "defaultValue": None,
+                        "values": {}
+                    }
+
+                for stringified_value, occurrences in values.items():
+                    if stringified_value not in result_values[callable_name][parameter_name]["values"]:
+                        result_values[callable_name][parameter_name]["values"][stringified_value] = []
+
+                    result_values[callable_name][parameter_name]["values"][stringified_value].extend(occurrences)
+
+    # merge classes
+    for class_name in result_classes.keys():
+        for callable_name, occurrences in result_calls.items():
+            if callable_name.startswith(class_name):
+                result_classes[class_name].extend(occurrences)
+
+    result_occurrences = {
+        "classes": result_classes,
+        "calls": result_calls,
+        "parameters": result_parameters,
+        "values": result_values
+    }
+
+    with out_dir.joinpath("$$$$$merged_occurrences$$$$$.json").open("w") as f:
+        json.dump(result_occurrences, f, indent=4)
+
+    return result_classes, result_calls, result_parameters, result_values
+
+
+def _aggregate_results(out_dir: Path, result_calls: CallStore, result_parameters: ParameterStore,
+                       result_values: ValueStore):
+    call_counts, parameter_counts, value_counts = _count(out_dir, result_calls, result_parameters, result_values)
+    _count_distribution(out_dir, call_counts, value_counts)
+    _affected_occurrences(out_dir, result_calls, result_values, call_counts, value_counts)
+
+
+def _removed_classes(out_dir: Path, class_store: ClassStore):
+    all_public_classes = set(class_store.keys())
+
+    used_public_classes: set[str] = set()
+    for class_name, occurrences in class_store.items():
+        if len(occurrences) > 0:
+            used_public_classes.add(class_name)
+    unused_public_classes = all_public_classes.difference(used_public_classes)
+
+    with out_dir.joinpath("$$$$$merged_class_analysis$$$$$.json").open("w") as f:
+        json.dump(
+            {
+                "all_public_classes": sorted(all_public_classes),
+                "number_of_all_public_classes": len(all_public_classes),
+
+                "used_public_classes": sorted(used_public_classes),
+                "number_of_used_public_classes": len(used_public_classes),
+
+                "unused_public_classes": sorted(unused_public_classes),
+                "number_of_unused_public_classes": len(unused_public_classes),
+            },
+            f,
+            indent=4
+        )
+
+
+def _count(
+    out_dir: Path,
+    result_calls: CallStore,
+    result_parameters: ParameterStore,
+    result_values: ValueStore
+) -> tuple[Any, Any, Any]:
+    call_counts = {
+        callable_name: len(occurrences)
+        for callable_name, occurrences in result_calls.items()
+    }
+
+    parameter_counts = {
+        callable_name: {
+            # how often a parameter is set explicitly
+            parameter_name: len(occurrences)
+            for parameter_name, occurrences in parameters.items()
+        }
+        for callable_name, parameters in result_parameters.items()
+    }
+
+    value_counts = {
+        callable_name: {
+            parameter_name: {
+                stringified_value:
+                    len(occurrences)
+                    if stringified_value != parameter_data["defaultValue"]
+                    # how often the default value is used (explicitly or implicitly)
+                    else call_counts[callable_name] - sum(
+                        [
+                            len(occurrences)
+                            for inner_stringified_value, occurrences in parameter_data["values"].items()
+                            if inner_stringified_value != parameter_data["defaultValue"]
+                        ]
+                    )
+                for stringified_value, occurrences in parameter_data["values"].items()
+            }
+            for parameter_name, parameter_data in parameters.items()
+        }
+        for callable_name, parameters in result_values.items()
+    }
+
+    result_counts = {
+        "calls": call_counts,
+        "values": value_counts
+    }
+
+    with out_dir.joinpath("$$$$$merged_counts$$$$$.json").open("w") as f:
+        json.dump(result_counts, f, indent=4)
+
+    result_counts_compacts = {
+        callable_name: {
+            "count": call_counts[callable_name],
+            "parameters": {
+                parameter_name: {
+                    "values": {
+                        stringified_value: value_count
+                        for stringified_value, value_count in sorted(
+                            values.items(),
+                            key=lambda it: it[1],
+                            reverse=True
+                        )
+                    }
+                }
+                for parameter_name, values in sorted(
+                    parameters.items(),
+                    key=lambda it: parameter_counts[callable_name][it[0]],
+                    reverse=True
+                )
+            }
+        }
+        for callable_name, parameters in sorted(
+            value_counts.items(),
+            key=lambda it: call_counts[it[0]],
+            reverse=True
+        )
+    }
+
+    with out_dir.joinpath("$$$$$merged_counts_compact$$$$$.json").open("w") as f:
+        json.dump(result_counts_compacts, f, indent=4)
+
+    return call_counts, parameter_counts, value_counts
+
+
+def _count_distribution(out_dir: Path, call_counts: Any, value_counts: Any):
+    # count classes that are used at most i times
+    flat_class_instantiation_counts = [
+        count
+        for callable_name, count in call_counts.items()
+        if callable_name.endswith("__init__")
+    ]
+    max_instantiation_count = max(flat_class_instantiation_counts)
+
+    class_instantiated_at_most = []
+    for i in range(max_instantiation_count + 1):
+        class_instantiated_at_most_i_times = len([count for count in flat_class_instantiation_counts if count <= i])
+        class_instantiated_at_most.append(class_instantiated_at_most_i_times)
+
+    with out_dir.joinpath("$$$$$merged_class_instantiated_at_most_index_times$$$$$.json").open("w") as f:
+        json.dump(
+            [
+                {"maxInstantiation": index, "classCount": count}
+                for index, count in enumerate(class_instantiated_at_most)
+            ],
+            f,
+            indent=4
+        )
+
+    # count functions that are used at most i times
+    flat_function_call_counts = [
+        count
+        for callable_name, count in call_counts.items()
+        if not callable_name.endswith("__init__")
+    ]
+    max_function_call_count = max(flat_function_call_counts)
+
+    function_called_at_most = []
+    for i in range(max_function_call_count + 1):
+        function_called_at_most_i_times = len([count for count in flat_function_call_counts if count <= i])
+        function_called_at_most.append(function_called_at_most_i_times)
+
+    with out_dir.joinpath("$$$$$merged_function_called_at_most_index_times$$$$$.json").open("w") as f:
+        json.dump(
+            [
+                {"maxCalls": index, "functionCount": count}
+                for index, count in enumerate(function_called_at_most)
+            ],
+            f,
+            indent=4
+        )
+
+    # count parameters where the most commonly used value is used in all but i cases
+    flat_parameter_counts = [
+        call_counts[callable_name] - max([count for count in parameters[parameter_name].values()],
+                                         default=call_counts[callable_name])
+        # otherwise the parameter is set but does not even exist
+        if sum([count for count in parameters[parameter_name].values()]) == call_counts[callable_name]
+        else sum([count for count in parameters[parameter_name].values()])
+
+        for callable_name, parameters in value_counts.items()
+        for parameter_name in parameters.keys()
+    ]
+    max_parameter_count = max(flat_parameter_counts)
+
+    parameter_used_at_most = []
+    for i in range(max_parameter_count + 1):
+        parameter_used_at_most_i_times = len([count for count in flat_parameter_counts if count <= i])
+        parameter_used_at_most.append(parameter_used_at_most_i_times)
+
+    with out_dir.joinpath("$$$$$merged_parameter_used_at_most_index_times$$$$$.json").open("w") as f:
+        json.dump(
+            [{"maxUsages": index, "parameterCount": count} for index, count in enumerate(parameter_used_at_most)],
+            f,
+            indent=4
+        )
+
+
+def _affected_occurrences(
+    out_dir: Path,
+    result_calls: CallStore,
+    result_values: ValueStore,
+    call_counts: Any,
+    value_counts: Any
+) -> None:
+    result = []
+
+    for callable_call_cutoff in range(0, 101):
+        for parameter_usage_cutoff in range(callable_call_cutoff, 101):
+            removed_callables = _callables_called_at_most_n_times(call_counts, callable_call_cutoff)
+            removed_parameters = _parameters_used_at_most_n_times(call_counts, value_counts, parameter_usage_cutoff)
+            n_affected_files = _n_affected_files(result_calls, result_values, removed_callables, removed_parameters)
+            result.append({
+                "callCutoff": callable_call_cutoff,
+                "parameterUsageCutoff": parameter_usage_cutoff,
+                "affectedPrograms": n_affected_files
+            })
+
+    with out_dir.joinpath("$$$$$merged_affected_occurrences$$$$$.json").open("w") as f:
+        json.dump(result, f, indent=4)
+
+
+def _callables_called_at_most_n_times(call_counts: Any, n: int) -> list[CallableName]:
+    return [
+        callable_name
+        for callable_name, count in call_counts.items()
+        if count <= n
+    ]
+
+
+def _parameters_used_at_most_n_times(
+    call_counts: Any,
+    value_counts: Any,
+    n: int
+) -> list[tuple[CallableName, ParameterName, list[StringifiedValue]]]:
+    return [
+        (callable_name, parameter_name, [
+            stringified_value
+            for stringified_value in values.keys()
+            if stringified_value != _most_common_value(value_counts, callable_name, parameter_name)[0]
+        ])
+
+        for callable_name, parameters in value_counts.items()
+        for parameter_name, values in parameters.items()
+
+        if _n_parameter_uses(call_counts, value_counts, callable_name, parameter_name) <= n
+    ]
+
+
+def _most_common_value(
+    value_counts: Any,
+    callable_name: str,
+    parameter_name: str
+) -> tuple[Optional[StringifiedValue], int]:
+    values = value_counts[callable_name][parameter_name].items()
+
+    result = None, 0
+    for stringified_value, count in values:
+        if count > result[1]:
+            result = stringified_value, count
+
+    return result
+
+
+def _n_parameter_uses(call_counts: Any, value_counts: Any, callable_name: str, parameter_name: str) -> int:
+    n_calls = call_counts[callable_name]
+    n_parameters_set = sum(count for count in value_counts[callable_name][parameter_name].values())
+
+    if n_calls == n_parameters_set:  # sum of counts how often each value is used should equal the number of calls
+        most_common_value, count = _most_common_value(value_counts, callable_name, parameter_name)
+        if most_common_value is None:
+            return 0
+
+        return n_calls - count
+
+    else:  # otherwise the parameter is set but does not even exist
+        return n_parameters_set
+
+
+def _n_affected_files(
+    result_calls: CallStore,
+    result_values: ValueStore,
+    removed_callables: list[CallableName],
+    removed_parameters: list[tuple[CallableName, ParameterName, list[StringifiedValue]]]
+) -> int:
+    affected_files = set()
+
+    for callable_name in removed_callables:
+        for occurrence in result_calls[callable_name]:
+            affected_files.add(occurrence[0])
+
+    for callable_name, parameter_name, stringified_values in removed_parameters:
+        for stringified_value in stringified_values:
+            # if the stringified value is not listed then it's never used explicitly (can only happen when
+            # another value is used more often than the default)
+            for occurrence in (result_values[callable_name][parameter_name]["values"].get(stringified_value) or []):
+                affected_files.add(occurrence[0])
+
+    return len(affected_files)
diff --git a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
new file mode 100644
index 000000000..1a4710cae
--- /dev/null
+++ b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
@@ -0,0 +1,345 @@
+import json
+from io import TextIOWrapper
+from pathlib import Path
+from typing import Any
+
+from package_parser.commands.find_usages import UsageStore, Usage
+from package_parser.commands.get_api import API
+from package_parser.utils import ensure_file_exists, parent_qname
+
+
+def suggest_improvements(
+    api_file: TextIOWrapper,
+    usages_file: TextIOWrapper,
+    out_dir: Path,
+    min_usages: int
+):
+    with api_file:
+        api_json = json.load(api_file)
+        api = API.from_json(api_json)
+
+    with usages_file:
+        usages_json = json.load(usages_file)
+        usages = UsageStore.from_json(usages_json)
+
+    out_dir.mkdir(parents=True, exist_ok=True)
+    base_file_name = api_file.name.replace("__api.json", "")
+
+    __preprocess_usages(usages, api)
+    __print_usage_counts(usages, out_dir, base_file_name)
+    __create_usage_distributions(usages, out_dir, base_file_name)
+    api_size_after_removal = __remove_rarely_used_api_elements(usages, min_usages, out_dir, base_file_name)
+    __write_api_size(api, api_size_after_removal, out_dir, base_file_name)
+    __optional_vs_required_parameters(usages, api, out_dir, base_file_name)
+
+
+def __preprocess_usages(usages: UsageStore, api: API) -> None:
+    __remove_internal_usages(usages, api)
+    __add_unused_api_elements(usages, api)
+    __add_implicit_usages_of_default_value(usages, api)
+
+
+def __print_usage_counts(usages, out_dir, base_file_name):
+    out_file = out_dir.joinpath(
+        f"{base_file_name}__usage_counts.json"
+    )
+    ensure_file_exists(out_file)
+    with out_file.open("w") as f:
+        json.dump(usages.to_count_json(), f, indent=2)
+
+def __create_usage_distributions(usages: UsageStore, out_dir: Path, base_file_name: str) -> None:
+    class_usage_distribution = __create_class_or_function_usage_distribution(usages.class_usages)
+    with out_dir.joinpath(f"{base_file_name}__class_usage_distribution.json").open("w") as f:
+        json.dump(class_usage_distribution, f, indent=2)
+
+    function_usage_distribution = __create_class_or_function_usage_distribution(usages.function_usages)
+    with out_dir.joinpath(f"{base_file_name}__function_usage_distribution.json").open("w") as f:
+        json.dump(function_usage_distribution, f, indent=2)
+
+    parameter_usage_distribution = __create_parameter_usage_distribution(usages)
+    with out_dir.joinpath(f"{base_file_name}__parameter_usage_distribution.json").open("w") as f:
+        json.dump(parameter_usage_distribution, f, indent=2)
+
+
+def __create_class_or_function_usage_distribution(usages: dict[str, list[Usage]]) -> dict[int, int]:
+    """
+    Creates a dictionary X -> N where N indicates the number of classes/functions that are used at most X times.
+
+    :param usages: Usages of classes/functions.
+    :return: The usage distribution.
+    """
+
+    result = {}
+
+    max_usages = max(len(it) for it in usages.values())
+    for i in range(max_usages + 1):
+        result[i] = len([it for it in usages.values() if len(it) >= i])
+
+    return result
+
+
+def __create_parameter_usage_distribution(usages: UsageStore) -> dict[int, int]:
+    """
+    Creates a dictionary X -> N where N indicates the number of parameters that are set at most X times to a value other
+    than the most commonly used value (which might differ from the default value).
+
+    :param usages: Usage store.
+    :return: The usage distribution.
+    """
+
+    result = {}
+
+    function_usages = usages.function_usages
+    parameter_usages = usages.parameter_usages
+    value_usages = usages.value_usages
+
+    max_usages = max(
+        __n_not_set_to_most_common_value(it, function_usages, value_usages)
+        for it in parameter_usages.keys()
+    )
+
+    for i in range(max_usages + 1):
+        result[i] = len(
+            [
+                it
+                for it in parameter_usages.keys()
+                if usages.n_function_usages(parent_qname(it)) >= i and
+                   (
+                       parent_qname(parent_qname(it)) not in usages.class_usages or
+                       usages.n_class_usages(parent_qname(parent_qname(it))) >= i
+                   ) and
+                   __n_not_set_to_most_common_value(it, function_usages, value_usages) >= i
+            ]
+        )
+
+    return result
+
+
+def __remove_internal_usages(usages: UsageStore, api: API) -> None:
+    """
+    Removes usages of internal parts of the API. It might incorrectly remove some calls to methods that are inherited
+    from internal classes into a public class but these are just fit/predict/etc., i.e. something we want to keep
+    unchanged anyway.
+
+    :param usages: Usage store
+    :param api: Description of the API
+    """
+
+    # Internal classes
+    for class_qname in list(usages.class_usages.keys()):
+        if not api.is_public_class(class_qname):
+            print(f"Removing usages of internal class {class_qname}")
+            usages.remove_class(class_qname)
+
+    # Internal functions
+    for function_qname in list(usages.function_usages.keys()):
+        if not api.is_public_function(function_qname):
+            print(f"Removing usages of internal function {function_qname}")
+            usages.remove_function(function_qname)
+
+    # Internal parameters
+    parameter_qnames = set(api.parameters().keys())
+
+    for parameter_qname in list(usages.parameter_usages.keys()):
+        function_qname = parent_qname(parameter_qname)
+        if parameter_qname not in parameter_qnames or not api.is_public_function(function_qname):
+            print(f"Removing usages of internal parameter {parameter_qname}")
+            usages.remove_parameter(parameter_qname)
+
+
+def __add_unused_api_elements(usages: UsageStore, api: API) -> None:
+    # Public classes
+    for class_qname in api.classes:
+        if api.is_public_class(class_qname):
+            usages.init_class(class_qname)
+
+    # Public functions
+    for function in api.functions.values():
+        if api.is_public_function(function.qname):
+            usages.init_function(function.qname)
+
+            # "Public" parameters
+            for parameter in function.parameters:
+                parameter_qname = f"{function.qname}.{parameter.name}"
+                usages.init_parameter(parameter_qname)
+                usages.init_value(parameter_qname)
+
+
+def __add_implicit_usages_of_default_value(usages: UsageStore, api: API) -> None:
+    for parameter_qname, parameter_usage_list in list(usages.parameter_usages.items()):
+        default_value = api.get_default_value(parameter_qname)
+        function_qname = parent_qname(parameter_qname)
+        function_usage_list = usages.function_usages[function_qname]
+
+        locations_of_implicit_usages_of_default_value = set(
+            [it.location for it in function_usage_list]
+        ) - set(
+            [it.location for it in parameter_usage_list]
+        )
+
+        for location in locations_of_implicit_usages_of_default_value:
+            usages.add_value_usage(parameter_qname, default_value, location)
+
+
+def __n_not_set_to_most_common_value(
+    parameter_qname: str,
+    function_usages: dict[str, list[Usage]],
+    value_usages: dict[str, dict[str, list[Usage]]]
+) -> int:
+    """Counts how often a parameter is set to a value other than the most commonly used value."""
+
+    n_total_usage = len(function_usages[parent_qname(parameter_qname)])
+
+    # Parameter is unused
+    # Checking both conditions even though one implies the other to ensure correctness of the program
+    if n_total_usage == 0 and len(value_usages[parameter_qname].values()) == 0:
+        return 0
+
+    n_set_to_most_commonly_used_value = max(len(it) for it in value_usages[parameter_qname].values())
+
+    return n_total_usage - n_set_to_most_commonly_used_value
+
+
+def __remove_rarely_used_api_elements(
+    usages: UsageStore,
+    min_usages: int,
+    out_dir: Path,
+    base_file_name: str
+) -> dict[str, Any]:
+    """
+    Removes API elements that are used fewer than min_usages times.
+
+    :return: The API size after the individual steps.
+    """
+
+    rarely_used_classes = __remove_rarely_used_classes(usages, min_usages)
+    api_size_after_unused_class_removal = __api_size_to_json(
+        len(usages.class_usages),
+        len(usages.function_usages),
+        len(usages.parameter_usages)
+    )
+    with out_dir.joinpath(f"{base_file_name}__classes_used_fewer_than_{min_usages}_times.json").open("w") as f:
+        json.dump(rarely_used_classes, f, indent=2)
+
+    rarely_used_functions = __remove_rarely_used_functions(usages, min_usages)
+    api_size_after_unused_function_removal = __api_size_to_json(
+        len(usages.class_usages),
+        len(usages.function_usages),
+        len(usages.parameter_usages)
+    )
+    with out_dir.joinpath(f"{base_file_name}__functions_used_fewer_than_{min_usages}_times.json").open("w") as f:
+        json.dump(rarely_used_functions, f, indent=2)
+
+    rarely_used_parameters = __remove_rarely_used_parameters(usages, min_usages)
+    api_size_after_unused_parameter_removal = __api_size_to_json(
+        len(usages.class_usages),
+        len(usages.function_usages),
+        len(usages.parameter_usages)
+    )
+    with out_dir.joinpath(f"{base_file_name}__parameters_used_fewer_than_{min_usages}_times.json").open("w") as f:
+        json.dump(rarely_used_parameters, f, indent=2)
+
+    mostly_useless_parameters = __remove_mostly_useless_parameters(usages, min_usages)
+    api_size_after_useless_parameter_removal = __api_size_to_json(
+        len(usages.class_usages),
+        len(usages.function_usages),
+        len(usages.parameter_usages)
+    )
+    with out_dir.joinpath(f"{base_file_name}__parameters_set_fewer_than_{min_usages}_times_to_value_other_than_most_common.json").open("w") as f:
+        json.dump(mostly_useless_parameters, f, indent=2)
+
+    return {
+        "after_unused_class_removal": api_size_after_unused_class_removal,
+        "after_unused_function_removal": api_size_after_unused_function_removal,
+        "after_unused_parameter_removal": api_size_after_unused_parameter_removal,
+        "after_useless_parameter_removal": api_size_after_useless_parameter_removal
+    }
+
+
+def __remove_rarely_used_classes(usages: UsageStore, min_usages: int) -> list[str]:
+    result = []
+
+    for class_qname in list(usages.class_usages.keys()):
+        if usages.n_class_usages(class_qname) < min_usages:
+            result.append(class_qname)
+            usages.remove_class(class_qname)
+
+    return sorted(result)
+
+
+def __remove_rarely_used_functions(usages: UsageStore, min_usages: int) -> list[str]:
+    result = []
+
+    for function_qname in list(usages.function_usages.keys()):
+        if usages.n_function_usages(function_qname) < min_usages:
+            result.append(function_qname)
+            usages.remove_function(function_qname)
+
+    return sorted(result)
+
+def __remove_rarely_used_parameters(usages: UsageStore, min_usages: int) -> list[str]:
+    result = []
+
+    for parameter_qname in list(usages.parameter_usages.keys()):
+        if usages.n_parameter_usages(parameter_qname) < min_usages:
+            result.append(parameter_qname)
+            usages.remove_parameter(parameter_qname)
+
+    return sorted(result)
+
+def __remove_mostly_useless_parameters(usages: UsageStore, min_usages: int) -> list[str]:
+    result = []
+
+    for parameter_qname in list(usages.parameter_usages.keys()):
+        usage_count = __n_not_set_to_most_common_value(parameter_qname, usages.function_usages, usages.value_usages)
+
+        if usage_count < min_usages:
+            result.append(parameter_qname)
+            usages.remove_parameter(parameter_qname)
+
+    return sorted(result)
+
+
+def __write_api_size(
+    api: API,
+    api_size_after_removal: dict[str, Any],
+    out_dir: Path,
+    base_file_name: str
+) -> None:
+    with out_dir.joinpath(f"{base_file_name}__api_size.json").open("w") as f:
+        json.dump({
+            "full": __api_size_to_json(
+                api.class_count(),
+                api.function_count(),
+                api.parameter_count()
+            ),
+            "public": __api_size_to_json(
+                api.public_class_count(),
+                api.public_function_count(),
+                api.public_parameter_count()
+            ),
+            "after_unused_class_removal": api_size_after_removal["after_unused_class_removal"],
+            "after_unused_function_removal": api_size_after_removal["after_unused_function_removal"],
+            "after_unused_parameter_removal": api_size_after_removal["after_unused_parameter_removal"],
+            "after_useless_parameter_removal": api_size_after_removal["after_useless_parameter_removal"]
+        }, f, indent=2)
+
+
+def __api_size_to_json(n_classes: int, n_functions: int, n_parameters: int) -> Any:
+    return {
+        "n_classes": n_classes,
+        "n_functions": n_functions,
+        "n_parameters": n_parameters
+    }
+
+
+def __optional_vs_required_parameters(
+    usages: UsageStore,
+    public_api: API,
+    out_dir: Path,
+    base_file_name: str
+) -> None:
+    # TODO: Determine whether parameter should be constant (already removed)/required/optional based on entropy
+    # TODO: Use must commonly set value as default
+
+    pass

From a3cf7c883461c60e44c35be306898038243f83d1 Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:05:37 +0100
Subject: [PATCH 02/12] refactor: remove old counter

---
 .../__old_call_and_parameter_counter.py       | 413 ------------------
 1 file changed, 413 deletions(-)
 delete mode 100644 package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py

diff --git a/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py b/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py
deleted file mode 100644
index f87a85fa7..000000000
--- a/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py
+++ /dev/null
@@ -1,413 +0,0 @@
-import json
-from pathlib import Path
-from typing import Optional, Any
-
-from package_parser.commands.get_api import get_api
-from package_parser.utils import list_files
-
-# Type aliases
-ClassName = str
-CallableName = str
-ParameterName = str
-StringifiedValue = str
-FileName = str
-LineNumber = int
-ColumnNumber = int
-Occurrence = tuple[FileName, Optional[LineNumber], Optional[ColumnNumber]]
-ClassStore = dict[ClassName, list[Occurrence]]
-CallStore = dict[CallableName, list[Occurrence]]
-ParameterStore = dict[CallableName, dict[ParameterName, list[Occurrence]]]
-ValueStore = dict[CallableName, dict[ParameterName, dict[str, Any]]]
-
-# Global values
-_relevant_packages = {
-    "sklearn",
-}
-
-
-# TODO: step 1: add_implicit_default_values
-
-def _merge_results(out_dir: Path) -> tuple[ClassStore, CallStore, ParameterStore, ValueStore]:
-    result_classes: ClassStore = {}
-    result_calls: CallStore = {}
-    result_parameters: ParameterStore = {}
-    result_values: ValueStore = {}
-
-    # Include all callables and parameters (and their default values) from relevant packages
-    for package_name in _relevant_packages:
-        callables, classes = get_api(package_name)
-
-        for callable_name, parameters in callables.items():
-            result_calls[callable_name] = []
-            result_parameters[callable_name] = {}
-            result_values[callable_name] = {}
-
-            for parameter_name, default_value in parameters.items():
-                result_parameters[callable_name][parameter_name] = []
-                result_values[callable_name][parameter_name] = {
-                    "defaultValue": default_value,
-                    "values": {}
-                }
-
-        for class_name in classes:
-            result_classes[class_name] = []
-
-    files = list_files(out_dir, ".json")
-    for index, file in enumerate(files):
-        if "$$$$$merged" in file:
-            continue  # this is an output of this process
-
-        print(f"Merging {file} ({index + 1}/{len(files)})")
-
-        with open(file, "r") as f:
-            content = json.load(f)
-
-        # merge calls
-        call_store: CallStore = content["calls"]
-        for callable_name, occurrences in call_store.items():
-            if callable_name not in result_calls:
-                # not part of the public API
-                continue
-
-            result_calls[callable_name].extend(occurrences)
-
-        # merge parameters
-        parameter_store: ParameterStore = content["parameters"]
-        for callable_name, parameters in parameter_store.items():
-            if callable_name not in result_parameters:
-                result_parameters[callable_name] = {}
-
-            for parameter_name, occurrences in parameters.items():
-                if parameter_name not in result_parameters[callable_name]:
-                    result_parameters[callable_name][parameter_name] = []
-
-                result_parameters[callable_name][parameter_name].extend(occurrences)
-
-        # merge values
-        value_store: ValueStore = content["values"]
-        for callable_name, parameters in value_store.items():
-            if callable_name not in result_values:
-                result_values[callable_name] = {}
-
-            for parameter_name, values in parameters.items():
-                if parameter_name not in result_values[callable_name]:
-                    result_values[callable_name][parameter_name] = {
-                        "defaultValue": None,
-                        "values": {}
-                    }
-
-                for stringified_value, occurrences in values.items():
-                    if stringified_value not in result_values[callable_name][parameter_name]["values"]:
-                        result_values[callable_name][parameter_name]["values"][stringified_value] = []
-
-                    result_values[callable_name][parameter_name]["values"][stringified_value].extend(occurrences)
-
-    # merge classes
-    for class_name in result_classes.keys():
-        for callable_name, occurrences in result_calls.items():
-            if callable_name.startswith(class_name):
-                result_classes[class_name].extend(occurrences)
-
-    result_occurrences = {
-        "classes": result_classes,
-        "calls": result_calls,
-        "parameters": result_parameters,
-        "values": result_values
-    }
-
-    with out_dir.joinpath("$$$$$merged_occurrences$$$$$.json").open("w") as f:
-        json.dump(result_occurrences, f, indent=4)
-
-    return result_classes, result_calls, result_parameters, result_values
-
-
-def _aggregate_results(out_dir: Path, result_calls: CallStore, result_parameters: ParameterStore,
-                       result_values: ValueStore):
-    call_counts, parameter_counts, value_counts = _count(out_dir, result_calls, result_parameters, result_values)
-    _count_distribution(out_dir, call_counts, value_counts)
-    _affected_occurrences(out_dir, result_calls, result_values, call_counts, value_counts)
-
-
-def _removed_classes(out_dir: Path, class_store: ClassStore):
-    all_public_classes = set(class_store.keys())
-
-    used_public_classes: set[str] = set()
-    for class_name, occurrences in class_store.items():
-        if len(occurrences) > 0:
-            used_public_classes.add(class_name)
-    unused_public_classes = all_public_classes.difference(used_public_classes)
-
-    with out_dir.joinpath("$$$$$merged_class_analysis$$$$$.json").open("w") as f:
-        json.dump(
-            {
-                "all_public_classes": sorted(all_public_classes),
-                "number_of_all_public_classes": len(all_public_classes),
-
-                "used_public_classes": sorted(used_public_classes),
-                "number_of_used_public_classes": len(used_public_classes),
-
-                "unused_public_classes": sorted(unused_public_classes),
-                "number_of_unused_public_classes": len(unused_public_classes),
-            },
-            f,
-            indent=4
-        )
-
-
-def _count(
-    out_dir: Path,
-    result_calls: CallStore,
-    result_parameters: ParameterStore,
-    result_values: ValueStore
-) -> tuple[Any, Any, Any]:
-    call_counts = {
-        callable_name: len(occurrences)
-        for callable_name, occurrences in result_calls.items()
-    }
-
-    parameter_counts = {
-        callable_name: {
-            # how often a parameter is set explicitly
-            parameter_name: len(occurrences)
-            for parameter_name, occurrences in parameters.items()
-        }
-        for callable_name, parameters in result_parameters.items()
-    }
-
-    value_counts = {
-        callable_name: {
-            parameter_name: {
-                stringified_value:
-                    len(occurrences)
-                    if stringified_value != parameter_data["defaultValue"]
-                    # how often the default value is used (explicitly or implicitly)
-                    else call_counts[callable_name] - sum(
-                        [
-                            len(occurrences)
-                            for inner_stringified_value, occurrences in parameter_data["values"].items()
-                            if inner_stringified_value != parameter_data["defaultValue"]
-                        ]
-                    )
-                for stringified_value, occurrences in parameter_data["values"].items()
-            }
-            for parameter_name, parameter_data in parameters.items()
-        }
-        for callable_name, parameters in result_values.items()
-    }
-
-    result_counts = {
-        "calls": call_counts,
-        "values": value_counts
-    }
-
-    with out_dir.joinpath("$$$$$merged_counts$$$$$.json").open("w") as f:
-        json.dump(result_counts, f, indent=4)
-
-    result_counts_compacts = {
-        callable_name: {
-            "count": call_counts[callable_name],
-            "parameters": {
-                parameter_name: {
-                    "values": {
-                        stringified_value: value_count
-                        for stringified_value, value_count in sorted(
-                            values.items(),
-                            key=lambda it: it[1],
-                            reverse=True
-                        )
-                    }
-                }
-                for parameter_name, values in sorted(
-                    parameters.items(),
-                    key=lambda it: parameter_counts[callable_name][it[0]],
-                    reverse=True
-                )
-            }
-        }
-        for callable_name, parameters in sorted(
-            value_counts.items(),
-            key=lambda it: call_counts[it[0]],
-            reverse=True
-        )
-    }
-
-    with out_dir.joinpath("$$$$$merged_counts_compact$$$$$.json").open("w") as f:
-        json.dump(result_counts_compacts, f, indent=4)
-
-    return call_counts, parameter_counts, value_counts
-
-
-def _count_distribution(out_dir: Path, call_counts: Any, value_counts: Any):
-    # count classes that are used at most i times
-    flat_class_instantiation_counts = [
-        count
-        for callable_name, count in call_counts.items()
-        if callable_name.endswith("__init__")
-    ]
-    max_instantiation_count = max(flat_class_instantiation_counts)
-
-    class_instantiated_at_most = []
-    for i in range(max_instantiation_count + 1):
-        class_instantiated_at_most_i_times = len([count for count in flat_class_instantiation_counts if count <= i])
-        class_instantiated_at_most.append(class_instantiated_at_most_i_times)
-
-    with out_dir.joinpath("$$$$$merged_class_instantiated_at_most_index_times$$$$$.json").open("w") as f:
-        json.dump(
-            [
-                {"maxInstantiation": index, "classCount": count}
-                for index, count in enumerate(class_instantiated_at_most)
-            ],
-            f,
-            indent=4
-        )
-
-    # count functions that are used at most i times
-    flat_function_call_counts = [
-        count
-        for callable_name, count in call_counts.items()
-        if not callable_name.endswith("__init__")
-    ]
-    max_function_call_count = max(flat_function_call_counts)
-
-    function_called_at_most = []
-    for i in range(max_function_call_count + 1):
-        function_called_at_most_i_times = len([count for count in flat_function_call_counts if count <= i])
-        function_called_at_most.append(function_called_at_most_i_times)
-
-    with out_dir.joinpath("$$$$$merged_function_called_at_most_index_times$$$$$.json").open("w") as f:
-        json.dump(
-            [
-                {"maxCalls": index, "functionCount": count}
-                for index, count in enumerate(function_called_at_most)
-            ],
-            f,
-            indent=4
-        )
-
-    # count parameters where the most commonly used value is used in all but i cases
-    flat_parameter_counts = [
-        call_counts[callable_name] - max([count for count in parameters[parameter_name].values()],
-                                         default=call_counts[callable_name])
-        # otherwise the parameter is set but does not even exist
-        if sum([count for count in parameters[parameter_name].values()]) == call_counts[callable_name]
-        else sum([count for count in parameters[parameter_name].values()])
-
-        for callable_name, parameters in value_counts.items()
-        for parameter_name in parameters.keys()
-    ]
-    max_parameter_count = max(flat_parameter_counts)
-
-    parameter_used_at_most = []
-    for i in range(max_parameter_count + 1):
-        parameter_used_at_most_i_times = len([count for count in flat_parameter_counts if count <= i])
-        parameter_used_at_most.append(parameter_used_at_most_i_times)
-
-    with out_dir.joinpath("$$$$$merged_parameter_used_at_most_index_times$$$$$.json").open("w") as f:
-        json.dump(
-            [{"maxUsages": index, "parameterCount": count} for index, count in enumerate(parameter_used_at_most)],
-            f,
-            indent=4
-        )
-
-
-def _affected_occurrences(
-    out_dir: Path,
-    result_calls: CallStore,
-    result_values: ValueStore,
-    call_counts: Any,
-    value_counts: Any
-) -> None:
-    result = []
-
-    for callable_call_cutoff in range(0, 101):
-        for parameter_usage_cutoff in range(callable_call_cutoff, 101):
-            removed_callables = _callables_called_at_most_n_times(call_counts, callable_call_cutoff)
-            removed_parameters = _parameters_used_at_most_n_times(call_counts, value_counts, parameter_usage_cutoff)
-            n_affected_files = _n_affected_files(result_calls, result_values, removed_callables, removed_parameters)
-            result.append({
-                "callCutoff": callable_call_cutoff,
-                "parameterUsageCutoff": parameter_usage_cutoff,
-                "affectedPrograms": n_affected_files
-            })
-
-    with out_dir.joinpath("$$$$$merged_affected_occurrences$$$$$.json").open("w") as f:
-        json.dump(result, f, indent=4)
-
-
-def _callables_called_at_most_n_times(call_counts: Any, n: int) -> list[CallableName]:
-    return [
-        callable_name
-        for callable_name, count in call_counts.items()
-        if count <= n
-    ]
-
-
-def _parameters_used_at_most_n_times(
-    call_counts: Any,
-    value_counts: Any,
-    n: int
-) -> list[tuple[CallableName, ParameterName, list[StringifiedValue]]]:
-    return [
-        (callable_name, parameter_name, [
-            stringified_value
-            for stringified_value in values.keys()
-            if stringified_value != _most_common_value(value_counts, callable_name, parameter_name)[0]
-        ])
-
-        for callable_name, parameters in value_counts.items()
-        for parameter_name, values in parameters.items()
-
-        if _n_parameter_uses(call_counts, value_counts, callable_name, parameter_name) <= n
-    ]
-
-
-def _most_common_value(
-    value_counts: Any,
-    callable_name: str,
-    parameter_name: str
-) -> tuple[Optional[StringifiedValue], int]:
-    values = value_counts[callable_name][parameter_name].items()
-
-    result = None, 0
-    for stringified_value, count in values:
-        if count > result[1]:
-            result = stringified_value, count
-
-    return result
-
-
-def _n_parameter_uses(call_counts: Any, value_counts: Any, callable_name: str, parameter_name: str) -> int:
-    n_calls = call_counts[callable_name]
-    n_parameters_set = sum(count for count in value_counts[callable_name][parameter_name].values())
-
-    if n_calls == n_parameters_set:  # sum of counts how often each value is used should equal the number of calls
-        most_common_value, count = _most_common_value(value_counts, callable_name, parameter_name)
-        if most_common_value is None:
-            return 0
-
-        return n_calls - count
-
-    else:  # otherwise the parameter is set but does not even exist
-        return n_parameters_set
-
-
-def _n_affected_files(
-    result_calls: CallStore,
-    result_values: ValueStore,
-    removed_callables: list[CallableName],
-    removed_parameters: list[tuple[CallableName, ParameterName, list[StringifiedValue]]]
-) -> int:
-    affected_files = set()
-
-    for callable_name in removed_callables:
-        for occurrence in result_calls[callable_name]:
-            affected_files.add(occurrence[0])
-
-    for callable_name, parameter_name, stringified_values in removed_parameters:
-        for stringified_value in stringified_values:
-            # if the stringified value is not listed then it's never used explicitly (can only happen when
-            # another value is used more often than the default)
-            for occurrence in (result_values[callable_name][parameter_name]["values"].get(stringified_value) or []):
-                affected_files.add(occurrence[0])
-
-    return len(affected_files)

From 6acca47268c0169a9c5689f39907c4c027d3457d Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:14:14 +0100
Subject: [PATCH 03/12] refactor: fix redeclaration (no block scope)

---
 .idea/workspace.xml                  | 88 +++++++++++++++++++---------
 package-parser/package_parser/cli.py |  9 +--
 2 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 15f3fcef9..13981aef5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,31 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ac142c8f-0c12-411c-b603-83c24ca369d9" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_ast_visitor.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_find_usages.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_model.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/suggest_improvements/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/suggest_improvements/__old_call_and_parameter_counter.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/api-editor.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/api-editor.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jsLinters/eslint.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/com.larsreimann.api_editor.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/prettier.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Backend_server.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Build.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Clean.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Server_tests.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package-parser/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/README.md" afterDir="false" />
+    <list default="true" id="ac142c8f-0c12-411c-b603-83c24ca369d9" name="Changes" comment="refactor: fix redeclaration (no block scope)">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package-parser/package_parser/cli.py" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/package_parser/cli.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_model.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -74,11 +53,34 @@
     "node.js.detected.package.eslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Modules",
+    "project.structure.last.edited": "SDKs",
     "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2"
+    "project.structure.side.proportion": "0.2",
+    "settings.editor.selected.configurable": "Errors"
   }
 }]]></component>
+  <component name="RunManager">
+    <configuration name="Python tests in tests" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+      <module name="package-parser" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/package-parser/tests" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/package-parser/tests&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python tests.Python tests in tests" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -87,8 +89,23 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1644500673135</updated>
-      <workItem from="1644500675625" duration="488000" />
+      <workItem from="1644500675625" duration="1723000" />
+    </task>
+    <task id="LOCAL-00001" summary="feat: add code from python-analyzer repository">
+      <created>1644501450796</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1644501450796</updated>
     </task>
+    <task id="LOCAL-00002" summary="refactor: remove old counter">
+      <created>1644501937462</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1644501937462</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -99,4 +116,21 @@
       </list>
     </option>
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="feat: add code from python-analyzer repository" />
+    <MESSAGE value="refactor: remove old counter" />
+    <MESSAGE value="refactor: fix redeclaration (no block scope)" />
+    <option name="LAST_COMMIT_MESSAGE" value="refactor: fix redeclaration (no block scope)" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/package-parser/package_parser/cli.py b/package-parser/package_parser/cli.py
index c0fe9943a..f05a11797 100644
--- a/package-parser/package_parser/cli.py
+++ b/package-parser/package_parser/cli.py
@@ -24,16 +24,14 @@ def default(self, o: Any) -> Any:
 
 def cli() -> None:
     args = __get_args()
-
     if args.command == __API_COMMAND:
         public_api = get_api(args.package)
         public_api_dependencies = get_dependencies(public_api)
 
-        out_dir: Path = args.out
-        out_file_api = out_dir.joinpath(
+        out_file_api = args.out.joinpath(
             f"{public_api.distribution}__{public_api.package}__{public_api.version}__api.json"
         )
-        out_file_api_dependencies = out_dir.joinpath(
+        out_file_api_dependencies = args.out.joinpath(
             f"{public_api.distribution}__{public_api.package}__{public_api.version}__api_dependencies.json"
         )
         ensure_file_exists(out_file_api)
@@ -47,8 +45,7 @@ def cli() -> None:
 
         dist = distribution(args.package)
 
-        out_dir: Path = args.out
-        out_file = out_dir.joinpath(
+        out_file = args.out.joinpath(
             f"{dist}__{args.package}__{distribution_version(dist)}__usages.json"
         )
         ensure_file_exists(out_file)

From 4fb1f97d2b4f75737f470ae0f1e6675ef707fe5e Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:14:26 +0100
Subject: [PATCH 04/12] refactor: fix redeclaration (no block scope)

---
 .../commands/find_usages/_model.py            | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/package-parser/package_parser/commands/find_usages/_model.py b/package-parser/package_parser/commands/find_usages/_model.py
index 2d3a72c6c..390e8c444 100644
--- a/package-parser/package_parser/commands/find_usages/_model.py
+++ b/package-parser/package_parser/commands/find_usages/_model.py
@@ -156,25 +156,29 @@ def merge_other_into_self(self, other_usage_store: UsageStore) -> UsageStore:
         """
 
         # Merge class usages
-        for usages in other_usage_store.class_usages.values():
-            for usage in usages:
-                self.add_class_usage(usage.qname, usage.location)
+        for class_usages in other_usage_store.class_usages.values():
+            for class_usage in class_usages:
+                self.add_class_usage(class_usage.qname, class_usage.location)
 
         # Merge function usages
-        for usages in other_usage_store.function_usages.values():
-            for usage in usages:
-                self.add_function_usage(usage.qname, usage.location)
+        for function_usages in other_usage_store.function_usages.values():
+            for function_usage in function_usages:
+                self.add_function_usage(function_usage.qname, function_usage.location)
 
         # Merge parameter usages
-        for usages in other_usage_store.parameter_usages.values():
-            for usage in usages:
-                self.add_parameter_usage(usage.qname, usage.location)
+        for parameter_usages in other_usage_store.parameter_usages.values():
+            for parameter_usage in parameter_usages:
+                self.add_parameter_usage(parameter_usage.qname, parameter_usage.location)
 
         # Merge value usages
-        for values in other_usage_store.value_usages.values():
-            for usages in values.values():
-                for usage in usages:
-                    self.add_value_usage(usage.parameter_qname, usage.value, usage.location)
+        for value_usages in other_usage_store.value_usages.values():
+            for value_usages_of_parameter in value_usages.values():
+                for value_usage_of_parameter in value_usages_of_parameter:
+                    self.add_value_usage(
+                        value_usage_of_parameter.parameter_qname,
+                        value_usage_of_parameter.value,
+                        value_usage_of_parameter.location
+                    )
 
         return self
 
@@ -252,9 +256,11 @@ def to_count_json(self) -> Any:
             }
         }
 
+
 class Usage:
     pass
 
+
 class ClassUsage(Usage):
     def __init__(self, qname: ClassQName, location: Location) -> None:
         self.qname: ClassQName = qname

From 0d534b9f9cb1011c77c5a0d2ead5e7caa7fd277a Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:21:01 +0100
Subject: [PATCH 05/12] style: fix various linting errors

---
 .idea/.gitignore                              |   1 +
 .idea/workspace.xml                           | 136 ------------------
 .../commands/find_usages/__init__.py          |   2 +-
 .../_suggest_improvements.py                  |  18 ++-
 4 files changed, 15 insertions(+), 142 deletions(-)
 create mode 100644 .idea/.gitignore
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000..a7c382ed3
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1 @@
+workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 13981aef5..000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="ac142c8f-0c12-411c-b603-83c24ca369d9" name="Changes" comment="refactor: fix redeclaration (no block scope)">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package-parser/package_parser/cli.py" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/package_parser/cli.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/package-parser/package_parser/commands/find_usages/_model.py" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ExternalProjectsData">
-    <projectState path="$PROJECT_DIR$/api-editor">
-      <ProjectState />
-    </projectState>
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view>
-          <tree_state>
-            <expand />
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="24vAQZPswFATMaoODo6b9bviJg1" />
-  <component name="ProjectViewState">
-    <option name="compactDirectories" value="true" />
-    <option name="flattenModules" value="true" />
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="false" />
-    <option name="showLibraryContents" value="true" />
-    <option name="showModules" value="false" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "SDKs",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "Errors"
-  }
-}]]></component>
-  <component name="RunManager">
-    <configuration name="Python tests in tests" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
-      <module name="package-parser" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/package-parser/tests" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/package-parser/tests&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Python tests.Python tests in tests" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ac142c8f-0c12-411c-b603-83c24ca369d9" name="Changes" comment="" />
-      <created>1644500673135</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1644500673135</updated>
-      <workItem from="1644500675625" duration="1723000" />
-    </task>
-    <task id="LOCAL-00001" summary="feat: add code from python-analyzer repository">
-      <created>1644501450796</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1644501450796</updated>
-    </task>
-    <task id="LOCAL-00002" summary="refactor: remove old counter">
-      <created>1644501937462</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1644501937462</updated>
-    </task>
-    <option name="localTasksCounter" value="3" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-    <option name="exactExcludedFiles">
-      <list>
-        <option value="$PROJECT_DIR$/api-editor/client/src/theme/index.d.ts" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="feat: add code from python-analyzer repository" />
-    <MESSAGE value="refactor: remove old counter" />
-    <MESSAGE value="refactor: fix redeclaration (no block scope)" />
-    <option name="LAST_COMMIT_MESSAGE" value="refactor: fix redeclaration (no block scope)" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/package-parser/package_parser/commands/find_usages/__init__.py b/package-parser/package_parser/commands/find_usages/__init__.py
index 19fe34c88..773aa2e69 100644
--- a/package-parser/package_parser/commands/find_usages/__init__.py
+++ b/package-parser/package_parser/commands/find_usages/__init__.py
@@ -1,2 +1,2 @@
 from ._find_usages import find_usages
-from ._model import UsageStore, Usage
+from ._model import UsageStore, Usage, ClassUsage, FunctionUsage, ParameterUsage, ValueUsage
diff --git a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
index 1a4710cae..c8b00561a 100644
--- a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
+++ b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
@@ -1,8 +1,9 @@
 import json
 from io import TextIOWrapper
 from pathlib import Path
-from typing import Any
+from typing import Any, Union
 
+from commands.find_usages import ClassUsage, FunctionUsage, ValueUsage
 from package_parser.commands.find_usages import UsageStore, Usage
 from package_parser.commands.get_api import API
 from package_parser.utils import ensure_file_exists, parent_qname
@@ -47,6 +48,7 @@ def __print_usage_counts(usages, out_dir, base_file_name):
     with out_file.open("w") as f:
         json.dump(usages.to_count_json(), f, indent=2)
 
+
 def __create_usage_distributions(usages: UsageStore, out_dir: Path, base_file_name: str) -> None:
     class_usage_distribution = __create_class_or_function_usage_distribution(usages.class_usages)
     with out_dir.joinpath(f"{base_file_name}__class_usage_distribution.json").open("w") as f:
@@ -61,7 +63,9 @@ def __create_usage_distributions(usages: UsageStore, out_dir: Path, base_file_na
         json.dump(parameter_usage_distribution, f, indent=2)
 
 
-def __create_class_or_function_usage_distribution(usages: dict[str, list[Usage]]) -> dict[int, int]:
+def __create_class_or_function_usage_distribution(
+    usages: dict[str, list[Union[ClassUsage, FunctionUsage]]]
+) -> dict[int, int]:
     """
     Creates a dictionary X -> N where N indicates the number of classes/functions that are used at most X times.
 
@@ -183,8 +187,8 @@ def __add_implicit_usages_of_default_value(usages: UsageStore, api: API) -> None
 
 def __n_not_set_to_most_common_value(
     parameter_qname: str,
-    function_usages: dict[str, list[Usage]],
-    value_usages: dict[str, dict[str, list[Usage]]]
+    function_usages: dict[str, list[FunctionUsage]],
+    value_usages: dict[str, dict[str, list[ValueUsage]]]
 ) -> int:
     """Counts how often a parameter is set to a value other than the most commonly used value."""
 
@@ -245,7 +249,9 @@ def __remove_rarely_used_api_elements(
         len(usages.function_usages),
         len(usages.parameter_usages)
     )
-    with out_dir.joinpath(f"{base_file_name}__parameters_set_fewer_than_{min_usages}_times_to_value_other_than_most_common.json").open("w") as f:
+    with out_dir.joinpath(
+        f"{base_file_name}__parameters_set_fewer_than_{min_usages}_times_to_value_other_than_most_common.json").open(
+        "w") as f:
         json.dump(mostly_useless_parameters, f, indent=2)
 
     return {
@@ -277,6 +283,7 @@ def __remove_rarely_used_functions(usages: UsageStore, min_usages: int) -> list[
 
     return sorted(result)
 
+
 def __remove_rarely_used_parameters(usages: UsageStore, min_usages: int) -> list[str]:
     result = []
 
@@ -287,6 +294,7 @@ def __remove_rarely_used_parameters(usages: UsageStore, min_usages: int) -> list
 
     return sorted(result)
 
+
 def __remove_mostly_useless_parameters(usages: UsageStore, min_usages: int) -> list[str]:
     result = []
 

From 0aa6d2faf6fd22fd3e08a41b818e4e085fa6dc6a Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:24:42 +0100
Subject: [PATCH 06/12] style: possible fix for another linting error

---
 .../package_parser/commands/find_usages/_find_usages.py      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package-parser/package_parser/commands/find_usages/_find_usages.py b/package-parser/package_parser/commands/find_usages/_find_usages.py
index fcd9fbde1..e609acef2 100644
--- a/package-parser/package_parser/commands/find_usages/_find_usages.py
+++ b/package-parser/package_parser/commands/find_usages/_find_usages.py
@@ -1,6 +1,7 @@
 import json
 import multiprocessing
 from pathlib import Path
+from typing import Optional
 
 import astroid
 
@@ -37,8 +38,10 @@ def find_usages(package_name: str, src_dir: Path, tmp_dir: Path):
     return _merge_results(tmp_dir)
 
 
+_lock: Optional[multiprocessing.Lock] = None
+
+
 def __initialize_process_environment(lock: multiprocessing.Lock):
-    # noinspection PyGlobalUndefined
     global _lock
     _lock = lock
 

From 54a9333187adbe27fa24e0791c0ae79e7f196c31 Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:25:46 +0100
Subject: [PATCH 07/12] style: possible fix for another linting error

---
 .../package_parser/commands/find_usages/_find_usages.py      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package-parser/package_parser/commands/find_usages/_find_usages.py b/package-parser/package_parser/commands/find_usages/_find_usages.py
index e609acef2..7cca4bf87 100644
--- a/package-parser/package_parser/commands/find_usages/_find_usages.py
+++ b/package-parser/package_parser/commands/find_usages/_find_usages.py
@@ -1,5 +1,6 @@
 import json
 import multiprocessing
+from multiprocessing import synchronize
 from pathlib import Path
 from typing import Optional
 
@@ -38,10 +39,10 @@ def find_usages(package_name: str, src_dir: Path, tmp_dir: Path):
     return _merge_results(tmp_dir)
 
 
-_lock: Optional[multiprocessing.Lock] = None
+_lock: Optional[synchronize.Lock] = None
 
 
-def __initialize_process_environment(lock: multiprocessing.Lock):
+def __initialize_process_environment(lock: synchronize.Lock):
     global _lock
     _lock = lock
 

From 31966a0970c948ba2fa050567d711b22d470dd90 Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 15:28:50 +0100
Subject: [PATCH 08/12] style: possible fix for another linting error

---
 .../commands/suggest_improvements/_suggest_improvements.py     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
index c8b00561a..2662dbf04 100644
--- a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
+++ b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
@@ -172,6 +172,9 @@ def __add_unused_api_elements(usages: UsageStore, api: API) -> None:
 def __add_implicit_usages_of_default_value(usages: UsageStore, api: API) -> None:
     for parameter_qname, parameter_usage_list in list(usages.parameter_usages.items()):
         default_value = api.get_default_value(parameter_qname)
+        if default_value is None:
+            continue
+
         function_qname = parent_qname(parameter_qname)
         function_usage_list = usages.function_usages[function_qname]
 

From 7797128c8f6ba1e9bc95c009e0baa051d7dc1846 Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 16:29:16 +0100
Subject: [PATCH 09/12] style: possible fix for another linting error

---
 .idea/gradle.xml                                                | 1 +
 .../package_parser/commands/find_usages/_find_usages.py         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7dfb811d1..2d81666ba 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/package-parser/package_parser/commands/find_usages/_find_usages.py b/package-parser/package_parser/commands/find_usages/_find_usages.py
index 7cca4bf87..6a1cec260 100644
--- a/package-parser/package_parser/commands/find_usages/_find_usages.py
+++ b/package-parser/package_parser/commands/find_usages/_find_usages.py
@@ -39,7 +39,7 @@ def find_usages(package_name: str, src_dir: Path, tmp_dir: Path):
     return _merge_results(tmp_dir)
 
 
-_lock: Optional[synchronize.Lock] = None
+_lock: synchronize.Lock = multiprocessing.Lock()
 
 
 def __initialize_process_environment(lock: synchronize.Lock):

From ab4655f52f8ecad58bfe470aff4a25b5d5891efc Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 16:33:31 +0100
Subject: [PATCH 10/12] fix: build error

---
 .../commands/suggest_improvements/_suggest_improvements.py     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
index 2662dbf04..be97a3306 100644
--- a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
+++ b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
@@ -3,8 +3,7 @@
 from pathlib import Path
 from typing import Any, Union
 
-from commands.find_usages import ClassUsage, FunctionUsage, ValueUsage
-from package_parser.commands.find_usages import UsageStore, Usage
+from package_parser.commands.find_usages import ClassUsage, FunctionUsage, ValueUsage, UsageStore
 from package_parser.commands.get_api import API
 from package_parser.utils import ensure_file_exists, parent_qname
 

From 0f1b37b2abc6afc6a556a934e110345817ad43d2 Mon Sep 17 00:00:00 2001
From: Lars Reimann <mail@larsreimann.com>
Date: Thu, 10 Feb 2022 16:40:35 +0100
Subject: [PATCH 11/12] fix: possible fix for type error

---
 .../commands/suggest_improvements/_suggest_improvements.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
index be97a3306..134fed747 100644
--- a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
+++ b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
@@ -63,7 +63,7 @@ def __create_usage_distributions(usages: UsageStore, out_dir: Path, base_file_na
 
 
 def __create_class_or_function_usage_distribution(
-    usages: dict[str, list[Union[ClassUsage, FunctionUsage]]]
+    usages: Union[dict[str, list[ClassUsage]], dict[str, list[FunctionUsage]]]
 ) -> dict[int, int]:
     """
     Creates a dictionary X -> N where N indicates the number of classes/functions that are used at most X times.

From 613a6623287fa897f7016e1a12eff6d4e3265c00 Mon Sep 17 00:00:00 2001
From: lars-reimann <lars-reimann@users.noreply.github.com>
Date: Thu, 10 Feb 2022 15:44:10 +0000
Subject: [PATCH 12/12] style: apply automatic fixes of linters

---
 package-parser/package_parser/cli.py          |  35 +---
 .../commands/find_usages/__init__.py          |   9 +-
 .../commands/find_usages/_ast_visitor.py      |  45 +++--
 .../commands/find_usages/_find_usages.py      |  14 +-
 .../commands/find_usages/_model.py            | 108 ++++++------
 .../_suggest_improvements.py                  | 164 ++++++++++--------
 6 files changed, 198 insertions(+), 177 deletions(-)

diff --git a/package-parser/package_parser/cli.py b/package-parser/package_parser/cli.py
index f05a11797..c82426cf3 100644
--- a/package-parser/package_parser/cli.py
+++ b/package-parser/package_parser/cli.py
@@ -69,10 +69,7 @@ def __get_args() -> argparse.Namespace:
 
 
 def __add_api_subparser(subparsers: _SubParsersAction) -> None:
-    api_parser = subparsers.add_parser(
-        __API_COMMAND,
-        help="List the API of a package."
-    )
+    api_parser = subparsers.add_parser(__API_COMMAND, help="List the API of a package.")
     api_parser.add_argument(
         "-p",
         "--package",
@@ -81,18 +78,13 @@ def __add_api_subparser(subparsers: _SubParsersAction) -> None:
         required=True,
     )
     api_parser.add_argument(
-        "-o",
-        "--out",
-        help="Output directory.",
-        type=Path,
-        required=True
+        "-o", "--out", help="Output directory.", type=Path, required=True
     )
 
 
 def __add_usages_subparser(subparsers: _SubParsersAction) -> None:
     usages_parser = subparsers.add_parser(
-        __USAGES_COMMAND,
-        help="Find usages of API elements."
+        __USAGES_COMMAND, help="Find usages of API elements."
     )
     usages_parser.add_argument(
         "-p",
@@ -116,39 +108,30 @@ def __add_usages_subparser(subparsers: _SubParsersAction) -> None:
         required=True,
     )
     usages_parser.add_argument(
-        "-o",
-        "--out",
-        help="Output directory.",
-        type=Path,
-        required=True
+        "-o", "--out", help="Output directory.", type=Path, required=True
     )
 
 
 def __add_improve_subparser(subparsers: _SubParsersAction) -> None:
     improve_parser = subparsers.add_parser(
-        __IMPROVE_COMMAND,
-        help="Suggest how to improve an existing API."
+        __IMPROVE_COMMAND, help="Suggest how to improve an existing API."
     )
     improve_parser.add_argument(
         "-a",
         "--api",
         help="File created by the 'api' command.",
-        type=argparse.FileType('r'),
+        type=argparse.FileType("r"),
         required=True,
     )
     improve_parser.add_argument(
         "-u",
         "--usages",
         help="File created by the 'usages' command.",
-        type=argparse.FileType('r'),
+        type=argparse.FileType("r"),
         required=True,
     )
     improve_parser.add_argument(
-        "-o",
-        "--out",
-        help="Output directory.",
-        type=Path,
-        required=True
+        "-o", "--out", help="Output directory.", type=Path, required=True
     )
     improve_parser.add_argument(
         "-m",
@@ -156,5 +139,5 @@ def __add_improve_subparser(subparsers: _SubParsersAction) -> None:
         help="Minimum number of usages required to keep an API element.",
         type=int,
         required=False,
-        default=1
+        default=1,
     )
diff --git a/package-parser/package_parser/commands/find_usages/__init__.py b/package-parser/package_parser/commands/find_usages/__init__.py
index 773aa2e69..c0f6a6ee4 100644
--- a/package-parser/package_parser/commands/find_usages/__init__.py
+++ b/package-parser/package_parser/commands/find_usages/__init__.py
@@ -1,2 +1,9 @@
 from ._find_usages import find_usages
-from ._model import UsageStore, Usage, ClassUsage, FunctionUsage, ParameterUsage, ValueUsage
+from ._model import (
+    ClassUsage,
+    FunctionUsage,
+    ParameterUsage,
+    Usage,
+    UsageStore,
+    ValueUsage,
+)
diff --git a/package-parser/package_parser/commands/find_usages/_ast_visitor.py b/package-parser/package_parser/commands/find_usages/_ast_visitor.py
index ba1984c14..48370b1a7 100644
--- a/package-parser/package_parser/commands/find_usages/_ast_visitor.py
+++ b/package-parser/package_parser/commands/find_usages/_ast_visitor.py
@@ -4,7 +4,7 @@
 from astroid.arguments import CallSite
 from astroid.helpers import safe_infer
 
-from ._model import UsageStore, Location
+from ._model import Location, UsageStore
 
 
 class _UsageFinder:
@@ -20,9 +20,7 @@ def enter_call(self, node: astroid.Call):
         called, function_qname, parameters, n_implicit_parameters = called_tuple
 
         bound_parameters = _bound_parameters(
-            parameters,
-            CallSite.from_call(node),
-            n_implicit_parameters
+            parameters, CallSite.from_call(node), n_implicit_parameters
         )
         if bound_parameters is None:
             return
@@ -30,9 +28,14 @@ def enter_call(self, node: astroid.Call):
         location = Location(self.python_file, node.lineno, node.col_offset)
 
         # Add class usage
-        if isinstance(called, (astroid.BoundMethod, astroid.UnboundMethod)) or \
-            isinstance(called, astroid.FunctionDef) and called.is_method():
-            self.usages.add_class_usage(".".join(function_qname.split(".")[:-1]), location)
+        if (
+            isinstance(called, (astroid.BoundMethod, astroid.UnboundMethod))
+            or isinstance(called, astroid.FunctionDef)
+            and called.is_method()
+        ):
+            self.usages.add_class_usage(
+                ".".join(function_qname.split(".")[:-1]), location
+            )
 
         # Add function usage
         self.usages.add_function_usage(function_qname, location)
@@ -46,18 +49,16 @@ def enter_call(self, node: astroid.Call):
             self.usages.add_value_usage(parameter_qname, value, location)
 
 
-def _analyze_declaration_called_by(node: astroid.Call, package_name: str) -> Optional[
-    tuple[astroid.NodeNG, str, astroid.Arguments, int]]:
+def _analyze_declaration_called_by(
+    node: astroid.Call, package_name: str
+) -> Optional[tuple[astroid.NodeNG, str, astroid.Arguments, int]]:
     """
     Returns None if the called declaration could not be determined or if it is not relevant for us. Otherwise, it
     returns a tuple with the form (called, qualified_name, parameters, n_implicit_parameters).
     """
 
     called = safe_infer(node.func)
-    if called is None or not __is_relevant_qualified_name(
-        package_name,
-        called.qname()
-    ):
+    if called is None or not __is_relevant_qualified_name(package_name, called.qname()):
         return None
 
     n_implicit_parameters = __n_implicit_parameters(called)
@@ -67,7 +68,9 @@ def _analyze_declaration_called_by(node: astroid.Call, package_name: str) -> Opt
         if called is None:
             return None
 
-    if isinstance(called, (astroid.BoundMethod, astroid.UnboundMethod, astroid.FunctionDef)):
+    if isinstance(
+        called, (astroid.BoundMethod, astroid.UnboundMethod, astroid.FunctionDef)
+    ):
         return called, called.qname(), called.args, n_implicit_parameters
     else:
         return None
@@ -99,17 +102,21 @@ def _stringify_value(value: astroid.NodeNG):
 
 
 def _bound_parameters(
-    parameters: astroid.Arguments,
-    arguments: CallSite,
-    n_implicit_parameters: int
+    parameters: astroid.Arguments, arguments: CallSite, n_implicit_parameters: int
 ) -> Optional[dict[str, astroid.NodeNG]]:
     # Improper call
-    if parameters.args is None or arguments.has_invalid_arguments() or arguments.has_invalid_keywords():
+    if (
+        parameters.args is None
+        or arguments.has_invalid_arguments()
+        or arguments.has_invalid_keywords()
+    ):
         return None
 
     result: dict[str, astroid.NodeNG] = arguments.keyword_arguments.copy()
 
-    positional_parameter_names = [it.name for it in (parameters.posonlyargs + parameters.args)][n_implicit_parameters:]
+    positional_parameter_names = [
+        it.name for it in (parameters.posonlyargs + parameters.args)
+    ][n_implicit_parameters:]
 
     for index, arg in enumerate(arguments.positional_arguments):
         if index >= len(positional_parameter_names):
diff --git a/package-parser/package_parser/commands/find_usages/_find_usages.py b/package-parser/package_parser/commands/find_usages/_find_usages.py
index 6a1cec260..9d19a50b6 100644
--- a/package-parser/package_parser/commands/find_usages/_find_usages.py
+++ b/package-parser/package_parser/commands/find_usages/_find_usages.py
@@ -5,8 +5,8 @@
 from typing import Optional
 
 import astroid
+from package_parser.utils import ASTWalker, initialize_and_read_exclude_file, list_files
 
-from package_parser.utils import initialize_and_read_exclude_file, list_files, ASTWalker
 from ._ast_visitor import _UsageFinder
 from ._model import UsageStore
 
@@ -19,7 +19,9 @@ def find_usages(package_name: str, src_dir: Path, tmp_dir: Path):
     exclude_file = tmp_dir.joinpath("$$$$$exclude$$$$$.txt")
     excluded_python_files = set(initialize_and_read_exclude_file(exclude_file))
 
-    python_files = [it for it in candidate_python_files if it not in excluded_python_files]
+    python_files = [
+        it for it in candidate_python_files if it not in excluded_python_files
+    ]
 
     tmp_dir.mkdir(parents=True, exist_ok=True)
 
@@ -27,11 +29,11 @@ def find_usages(package_name: str, src_dir: Path, tmp_dir: Path):
     with multiprocessing.Pool(
         processes=__N_PROCESSES,
         initializer=__initialize_process_environment,
-        initargs=(lock,)
+        initargs=(lock,),
     ) as pool:
         pool.starmap(
             __find_usages_in_single_file,
-            [[package_name, it, exclude_file, tmp_dir] for it in python_files]
+            [[package_name, it, exclude_file, tmp_dir] for it in python_files],
         )
     pool.join()
     pool.close()
@@ -64,7 +66,9 @@ def __find_usages_in_single_file(
             ASTWalker(usage_finder).walk(astroid.parse(source))
 
             tmp_file = tmp_dir.joinpath(
-                python_file.replace("/", "__").replace("\\", "__").replace(".py", ".json")
+                python_file.replace("/", "__")
+                .replace("\\", "__")
+                .replace(".py", ".json")
             )
             with tmp_file.open("w") as f:
                 json.dump(usage_finder.usages.to_json(), f, indent=2)
diff --git a/package-parser/package_parser/commands/find_usages/_model.py b/package-parser/package_parser/commands/find_usages/_model.py
index 390e8c444..525093e1b 100644
--- a/package-parser/package_parser/commands/find_usages/_model.py
+++ b/package-parser/package_parser/commands/find_usages/_model.py
@@ -9,7 +9,6 @@
 
 
 class UsageStore:
-
     @staticmethod
     def from_json(json: Any) -> UsageStore:
         result = UsageStore()
@@ -37,7 +36,9 @@ def from_json(json: Any) -> UsageStore:
         for parameter_qname, values in value_usages.items():
             for value, locations in values.items():
                 for location in locations:
-                    result.add_value_usage(parameter_qname, value, Location.from_json(location))
+                    result.add_value_usage(
+                        parameter_qname, value, Location.from_json(location)
+                    )
 
         return result
 
@@ -45,7 +46,9 @@ def __init__(self) -> None:
         self.class_usages: dict[ClassQName, list[ClassUsage]] = {}
         self.function_usages: dict[FunctionQName, list[FunctionUsage]] = {}
         self.parameter_usages: dict[ParameterQName, list[ParameterUsage]] = {}
-        self.value_usages: dict[ParameterQName, dict[StringifiedValue, list[ValueUsage]]] = {}
+        self.value_usages: dict[
+            ParameterQName, dict[StringifiedValue, list[ValueUsage]]
+        ] = {}
 
     def add_class_usage(self, qname: ClassQName, location: Location) -> None:
         self.init_class(qname)
@@ -93,13 +96,20 @@ def remove_parameter(self, qname: ParameterQName) -> None:
 
         self.remove_value(qname)
 
-    def add_value_usage(self, parameter_qname: ParameterQName, value: StringifiedValue, location: Location) -> None:
+    def add_value_usage(
+        self,
+        parameter_qname: ParameterQName,
+        value: StringifiedValue,
+        location: Location,
+    ) -> None:
         self.init_value(parameter_qname)
 
         if value not in self.value_usages[parameter_qname]:
             self.value_usages[parameter_qname][value] = []
 
-        self.value_usages[parameter_qname][value].append(ValueUsage(parameter_qname, value, location))
+        self.value_usages[parameter_qname][value].append(
+            ValueUsage(parameter_qname, value, location)
+        )
 
     def init_value(self, parameter_qname: ParameterQName) -> None:
         if parameter_qname not in self.value_usages:
@@ -168,7 +178,9 @@ def merge_other_into_self(self, other_usage_store: UsageStore) -> UsageStore:
         # Merge parameter usages
         for parameter_usages in other_usage_store.parameter_usages.values():
             for parameter_usage in parameter_usages:
-                self.add_parameter_usage(parameter_usage.qname, parameter_usage.location)
+                self.add_parameter_usage(
+                    parameter_usage.qname, parameter_usage.location
+                )
 
         # Merge value usages
         for value_usages in other_usage_store.value_usages.values():
@@ -177,7 +189,7 @@ def merge_other_into_self(self, other_usage_store: UsageStore) -> UsageStore:
                     self.add_value_usage(
                         value_usage_of_parameter.parameter_qname,
                         value_usage_of_parameter.value,
-                        value_usage_of_parameter.location
+                        value_usage_of_parameter.location,
                     )
 
         return self
@@ -185,32 +197,20 @@ def merge_other_into_self(self, other_usage_store: UsageStore) -> UsageStore:
     def to_json(self) -> Any:
         return {
             "class_usages": {
-                qname: [
-                    usage.location.to_json()
-                    for usage in usages
-                ]
+                qname: [usage.location.to_json() for usage in usages]
                 for qname, usages in self.class_usages.items()
             },
             "function_usages": {
-                qname: [
-                    usage.location.to_json()
-                    for usage in usages
-                ]
+                qname: [usage.location.to_json() for usage in usages]
                 for qname, usages in self.function_usages.items()
             },
             "parameter_usages": {
-                qname: [
-                    usage.location.to_json()
-                    for usage in usages
-                ]
+                qname: [usage.location.to_json() for usage in usages]
                 for qname, usages in self.parameter_usages.items()
             },
             "value_usages": {
                 parameter_qname: {
-                    value: [
-                        usage.location.to_json()
-                        for usage in usages
-                    ]
+                    value: [usage.location.to_json() for usage in usages]
                     for value, usages in values.items()
                 }
                 for parameter_qname, values in self.value_usages.items()
@@ -224,7 +224,7 @@ def to_count_json(self) -> Any:
                 for qname, usages in sorted(
                     self.class_usages.items(),
                     key=lambda item: len(item[1]),
-                    reverse=True
+                    reverse=True,
                 )
             },
             "function_counts": {
@@ -232,7 +232,7 @@ def to_count_json(self) -> Any:
                 for qname, usages in sorted(
                     self.function_usages.items(),
                     key=lambda item: len(item[1]),
-                    reverse=True
+                    reverse=True,
                 )
             },
             "parameter_counts": {
@@ -240,20 +240,18 @@ def to_count_json(self) -> Any:
                 for qname, usages in sorted(
                     self.parameter_usages.items(),
                     key=lambda item: len(item[1]),
-                    reverse=True
+                    reverse=True,
                 )
             },
             "value_counts": {
                 parameter_qname: {
                     value: len(usages)
                     for value, usages in sorted(
-                        values.items(),
-                        key=lambda item: len(item[1]),
-                        reverse=True
+                        values.items(), key=lambda item: len(item[1]), reverse=True
                     )
                 }
                 for parameter_qname, values in self.value_usages.items()
-            }
+            },
         }
 
 
@@ -267,10 +265,7 @@ def __init__(self, qname: ClassQName, location: Location) -> None:
         self.location: Location = location
 
     def to_json(self) -> Any:
-        return {
-            "qname": self.qname,
-            "location": self.location.to_json()
-        }
+        return {"qname": self.qname, "location": self.location.to_json()}
 
 
 class FunctionUsage(Usage):
@@ -279,10 +274,7 @@ def __init__(self, qname: FunctionQName, location: Location) -> None:
         self.location: Location = location
 
     def to_json(self) -> Any:
-        return {
-            "qname": self.qname,
-            "location": self.location.to_json()
-        }
+        return {"qname": self.qname, "location": self.location.to_json()}
 
 
 class ParameterUsage(Usage):
@@ -291,14 +283,16 @@ def __init__(self, qname: ParameterQName, location: Location) -> None:
         self.location: Location = location
 
     def to_json(self) -> Any:
-        return {
-            "qname": self.qname,
-            "location": self.location.to_json()
-        }
+        return {"qname": self.qname, "location": self.location.to_json()}
 
 
 class ValueUsage(Usage):
-    def __init__(self, parameter_qname: ParameterQName, value: StringifiedValue, location: Location) -> None:
+    def __init__(
+        self,
+        parameter_qname: ParameterQName,
+        value: StringifiedValue,
+        location: Location,
+    ) -> None:
         self.parameter_qname: ParameterQName = parameter_qname
         self.value: StringifiedValue = value
         self.location: Location = location
@@ -307,7 +301,7 @@ def to_json(self) -> Any:
         return {
             "parameter_qname": self.parameter_qname,
             "value": self.value,
-            "location": self.location.to_json()
+            "location": self.location.to_json(),
         }
 
 
@@ -317,16 +311,13 @@ def to_json(self) -> Any:
 
 
 class Location:
-
     @staticmethod
     def from_json(json: Any) -> Location:
-        return Location(
-            json["file"],
-            json["line"],
-            json["column"]
-        )
+        return Location(json["file"], json["line"], json["column"])
 
-    def __init__(self, file: FileName, line: Optional[LineNumber], column: Optional[ColumnNumber]) -> None:
+    def __init__(
+        self, file: FileName, line: Optional[LineNumber], column: Optional[ColumnNumber]
+    ) -> None:
         self.file: FileName = file
         self.line: Optional[LineNumber] = line
         self.column: Optional[ColumnNumber] = column
@@ -335,15 +326,16 @@ def __repr__(self) -> str:
         return f"{self.file}@{self.line}:{self.column}"
 
     def __eq__(self, other: object) -> bool:
-        if not isinstance(other, type(self)): return NotImplemented
-        return self.file == other.file and self.line == other.line and self.column == other.column
+        if not isinstance(other, type(self)):
+            return NotImplemented
+        return (
+            self.file == other.file
+            and self.line == other.line
+            and self.column == other.column
+        )
 
     def __hash__(self) -> int:
         return hash((self.file, self.line, self.column))
 
     def to_json(self) -> Any:
-        return {
-            "file": self.file,
-            "line": self.line,
-            "column": self.column
-        }
+        return {"file": self.file, "line": self.line, "column": self.column}
diff --git a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
index 134fed747..90e01315d 100644
--- a/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
+++ b/package-parser/package_parser/commands/suggest_improvements/_suggest_improvements.py
@@ -3,16 +3,18 @@
 from pathlib import Path
 from typing import Any, Union
 
-from package_parser.commands.find_usages import ClassUsage, FunctionUsage, ValueUsage, UsageStore
+from package_parser.commands.find_usages import (
+    ClassUsage,
+    FunctionUsage,
+    UsageStore,
+    ValueUsage,
+)
 from package_parser.commands.get_api import API
 from package_parser.utils import ensure_file_exists, parent_qname
 
 
 def suggest_improvements(
-    api_file: TextIOWrapper,
-    usages_file: TextIOWrapper,
-    out_dir: Path,
-    min_usages: int
+    api_file: TextIOWrapper, usages_file: TextIOWrapper, out_dir: Path, min_usages: int
 ):
     with api_file:
         api_json = json.load(api_file)
@@ -28,7 +30,9 @@ def suggest_improvements(
     __preprocess_usages(usages, api)
     __print_usage_counts(usages, out_dir, base_file_name)
     __create_usage_distributions(usages, out_dir, base_file_name)
-    api_size_after_removal = __remove_rarely_used_api_elements(usages, min_usages, out_dir, base_file_name)
+    api_size_after_removal = __remove_rarely_used_api_elements(
+        usages, min_usages, out_dir, base_file_name
+    )
     __write_api_size(api, api_size_after_removal, out_dir, base_file_name)
     __optional_vs_required_parameters(usages, api, out_dir, base_file_name)
 
@@ -40,25 +44,35 @@ def __preprocess_usages(usages: UsageStore, api: API) -> None:
 
 
 def __print_usage_counts(usages, out_dir, base_file_name):
-    out_file = out_dir.joinpath(
-        f"{base_file_name}__usage_counts.json"
-    )
+    out_file = out_dir.joinpath(f"{base_file_name}__usage_counts.json")
     ensure_file_exists(out_file)
     with out_file.open("w") as f:
         json.dump(usages.to_count_json(), f, indent=2)
 
 
-def __create_usage_distributions(usages: UsageStore, out_dir: Path, base_file_name: str) -> None:
-    class_usage_distribution = __create_class_or_function_usage_distribution(usages.class_usages)
-    with out_dir.joinpath(f"{base_file_name}__class_usage_distribution.json").open("w") as f:
+def __create_usage_distributions(
+    usages: UsageStore, out_dir: Path, base_file_name: str
+) -> None:
+    class_usage_distribution = __create_class_or_function_usage_distribution(
+        usages.class_usages
+    )
+    with out_dir.joinpath(f"{base_file_name}__class_usage_distribution.json").open(
+        "w"
+    ) as f:
         json.dump(class_usage_distribution, f, indent=2)
 
-    function_usage_distribution = __create_class_or_function_usage_distribution(usages.function_usages)
-    with out_dir.joinpath(f"{base_file_name}__function_usage_distribution.json").open("w") as f:
+    function_usage_distribution = __create_class_or_function_usage_distribution(
+        usages.function_usages
+    )
+    with out_dir.joinpath(f"{base_file_name}__function_usage_distribution.json").open(
+        "w"
+    ) as f:
         json.dump(function_usage_distribution, f, indent=2)
 
     parameter_usage_distribution = __create_parameter_usage_distribution(usages)
-    with out_dir.joinpath(f"{base_file_name}__parameter_usage_distribution.json").open("w") as f:
+    with out_dir.joinpath(f"{base_file_name}__parameter_usage_distribution.json").open(
+        "w"
+    ) as f:
         json.dump(parameter_usage_distribution, f, indent=2)
 
 
@@ -106,12 +120,13 @@ def __create_parameter_usage_distribution(usages: UsageStore) -> dict[int, int]:
             [
                 it
                 for it in parameter_usages.keys()
-                if usages.n_function_usages(parent_qname(it)) >= i and
-                   (
-                       parent_qname(parent_qname(it)) not in usages.class_usages or
-                       usages.n_class_usages(parent_qname(parent_qname(it))) >= i
-                   ) and
-                   __n_not_set_to_most_common_value(it, function_usages, value_usages) >= i
+                if usages.n_function_usages(parent_qname(it)) >= i
+                and (
+                    parent_qname(parent_qname(it)) not in usages.class_usages
+                    or usages.n_class_usages(parent_qname(parent_qname(it))) >= i
+                )
+                and __n_not_set_to_most_common_value(it, function_usages, value_usages)
+                >= i
             ]
         )
 
@@ -145,7 +160,9 @@ def __remove_internal_usages(usages: UsageStore, api: API) -> None:
 
     for parameter_qname in list(usages.parameter_usages.keys()):
         function_qname = parent_qname(parameter_qname)
-        if parameter_qname not in parameter_qnames or not api.is_public_function(function_qname):
+        if parameter_qname not in parameter_qnames or not api.is_public_function(
+            function_qname
+        ):
             print(f"Removing usages of internal parameter {parameter_qname}")
             usages.remove_parameter(parameter_qname)
 
@@ -179,9 +196,7 @@ def __add_implicit_usages_of_default_value(usages: UsageStore, api: API) -> None
 
         locations_of_implicit_usages_of_default_value = set(
             [it.location for it in function_usage_list]
-        ) - set(
-            [it.location for it in parameter_usage_list]
-        )
+        ) - set([it.location for it in parameter_usage_list])
 
         for location in locations_of_implicit_usages_of_default_value:
             usages.add_value_usage(parameter_qname, default_value, location)
@@ -190,7 +205,7 @@ def __add_implicit_usages_of_default_value(usages: UsageStore, api: API) -> None
 def __n_not_set_to_most_common_value(
     parameter_qname: str,
     function_usages: dict[str, list[FunctionUsage]],
-    value_usages: dict[str, dict[str, list[ValueUsage]]]
+    value_usages: dict[str, dict[str, list[ValueUsage]]],
 ) -> int:
     """Counts how often a parameter is set to a value other than the most commonly used value."""
 
@@ -201,16 +216,15 @@ def __n_not_set_to_most_common_value(
     if n_total_usage == 0 and len(value_usages[parameter_qname].values()) == 0:
         return 0
 
-    n_set_to_most_commonly_used_value = max(len(it) for it in value_usages[parameter_qname].values())
+    n_set_to_most_commonly_used_value = max(
+        len(it) for it in value_usages[parameter_qname].values()
+    )
 
     return n_total_usage - n_set_to_most_commonly_used_value
 
 
 def __remove_rarely_used_api_elements(
-    usages: UsageStore,
-    min_usages: int,
-    out_dir: Path,
-    base_file_name: str
+    usages: UsageStore, min_usages: int, out_dir: Path, base_file_name: str
 ) -> dict[str, Any]:
     """
     Removes API elements that are used fewer than min_usages times.
@@ -222,45 +236,51 @@ def __remove_rarely_used_api_elements(
     api_size_after_unused_class_removal = __api_size_to_json(
         len(usages.class_usages),
         len(usages.function_usages),
-        len(usages.parameter_usages)
+        len(usages.parameter_usages),
     )
-    with out_dir.joinpath(f"{base_file_name}__classes_used_fewer_than_{min_usages}_times.json").open("w") as f:
+    with out_dir.joinpath(
+        f"{base_file_name}__classes_used_fewer_than_{min_usages}_times.json"
+    ).open("w") as f:
         json.dump(rarely_used_classes, f, indent=2)
 
     rarely_used_functions = __remove_rarely_used_functions(usages, min_usages)
     api_size_after_unused_function_removal = __api_size_to_json(
         len(usages.class_usages),
         len(usages.function_usages),
-        len(usages.parameter_usages)
+        len(usages.parameter_usages),
     )
-    with out_dir.joinpath(f"{base_file_name}__functions_used_fewer_than_{min_usages}_times.json").open("w") as f:
+    with out_dir.joinpath(
+        f"{base_file_name}__functions_used_fewer_than_{min_usages}_times.json"
+    ).open("w") as f:
         json.dump(rarely_used_functions, f, indent=2)
 
     rarely_used_parameters = __remove_rarely_used_parameters(usages, min_usages)
     api_size_after_unused_parameter_removal = __api_size_to_json(
         len(usages.class_usages),
         len(usages.function_usages),
-        len(usages.parameter_usages)
+        len(usages.parameter_usages),
     )
-    with out_dir.joinpath(f"{base_file_name}__parameters_used_fewer_than_{min_usages}_times.json").open("w") as f:
+    with out_dir.joinpath(
+        f"{base_file_name}__parameters_used_fewer_than_{min_usages}_times.json"
+    ).open("w") as f:
         json.dump(rarely_used_parameters, f, indent=2)
 
     mostly_useless_parameters = __remove_mostly_useless_parameters(usages, min_usages)
     api_size_after_useless_parameter_removal = __api_size_to_json(
         len(usages.class_usages),
         len(usages.function_usages),
-        len(usages.parameter_usages)
+        len(usages.parameter_usages),
     )
     with out_dir.joinpath(
-        f"{base_file_name}__parameters_set_fewer_than_{min_usages}_times_to_value_other_than_most_common.json").open(
-        "w") as f:
+        f"{base_file_name}__parameters_set_fewer_than_{min_usages}_times_to_value_other_than_most_common.json"
+    ).open("w") as f:
         json.dump(mostly_useless_parameters, f, indent=2)
 
     return {
         "after_unused_class_removal": api_size_after_unused_class_removal,
         "after_unused_function_removal": api_size_after_unused_function_removal,
         "after_unused_parameter_removal": api_size_after_unused_parameter_removal,
-        "after_useless_parameter_removal": api_size_after_useless_parameter_removal
+        "after_useless_parameter_removal": api_size_after_useless_parameter_removal,
     }
 
 
@@ -297,11 +317,15 @@ def __remove_rarely_used_parameters(usages: UsageStore, min_usages: int) -> list
     return sorted(result)
 
 
-def __remove_mostly_useless_parameters(usages: UsageStore, min_usages: int) -> list[str]:
+def __remove_mostly_useless_parameters(
+    usages: UsageStore, min_usages: int
+) -> list[str]:
     result = []
 
     for parameter_qname in list(usages.parameter_usages.keys()):
-        usage_count = __n_not_set_to_most_common_value(parameter_qname, usages.function_usages, usages.value_usages)
+        usage_count = __n_not_set_to_most_common_value(
+            parameter_qname, usages.function_usages, usages.value_usages
+        )
 
         if usage_count < min_usages:
             result.append(parameter_qname)
@@ -311,43 +335,47 @@ def __remove_mostly_useless_parameters(usages: UsageStore, min_usages: int) -> l
 
 
 def __write_api_size(
-    api: API,
-    api_size_after_removal: dict[str, Any],
-    out_dir: Path,
-    base_file_name: str
+    api: API, api_size_after_removal: dict[str, Any], out_dir: Path, base_file_name: str
 ) -> None:
     with out_dir.joinpath(f"{base_file_name}__api_size.json").open("w") as f:
-        json.dump({
-            "full": __api_size_to_json(
-                api.class_count(),
-                api.function_count(),
-                api.parameter_count()
-            ),
-            "public": __api_size_to_json(
-                api.public_class_count(),
-                api.public_function_count(),
-                api.public_parameter_count()
-            ),
-            "after_unused_class_removal": api_size_after_removal["after_unused_class_removal"],
-            "after_unused_function_removal": api_size_after_removal["after_unused_function_removal"],
-            "after_unused_parameter_removal": api_size_after_removal["after_unused_parameter_removal"],
-            "after_useless_parameter_removal": api_size_after_removal["after_useless_parameter_removal"]
-        }, f, indent=2)
+        json.dump(
+            {
+                "full": __api_size_to_json(
+                    api.class_count(), api.function_count(), api.parameter_count()
+                ),
+                "public": __api_size_to_json(
+                    api.public_class_count(),
+                    api.public_function_count(),
+                    api.public_parameter_count(),
+                ),
+                "after_unused_class_removal": api_size_after_removal[
+                    "after_unused_class_removal"
+                ],
+                "after_unused_function_removal": api_size_after_removal[
+                    "after_unused_function_removal"
+                ],
+                "after_unused_parameter_removal": api_size_after_removal[
+                    "after_unused_parameter_removal"
+                ],
+                "after_useless_parameter_removal": api_size_after_removal[
+                    "after_useless_parameter_removal"
+                ],
+            },
+            f,
+            indent=2,
+        )
 
 
 def __api_size_to_json(n_classes: int, n_functions: int, n_parameters: int) -> Any:
     return {
         "n_classes": n_classes,
         "n_functions": n_functions,
-        "n_parameters": n_parameters
+        "n_parameters": n_parameters,
     }
 
 
 def __optional_vs_required_parameters(
-    usages: UsageStore,
-    public_api: API,
-    out_dir: Path,
-    base_file_name: str
+    usages: UsageStore, public_api: API, out_dir: Path, base_file_name: str
 ) -> None:
     # TODO: Determine whether parameter should be constant (already removed)/required/optional based on entropy
     # TODO: Use must commonly set value as default