diff --git a/ijs.tree b/ijs.tree
index ca80b1a8f..3ef3a4127 100644
--- a/ijs.tree
+++ b/ijs.tree
@@ -296,7 +296,9 @@
-
+
+
+
diff --git a/topics/products/clion/clion.md b/topics/products/clion/clion.md
index d19692317..dc647d01a 100644
--- a/topics/products/clion/clion.md
+++ b/topics/products/clion/clion.md
@@ -41,6 +41,11 @@ As described in [Modules Specific to Functionality](plugin_compatibility.md#modu
```
## Available CLion APIs
+
+ > See [CLion Extension Point List](clion_extension_point_list.md) for complete list.
+ >
+ {type="note"}
+
Use the [Exploring APIs as a Consumer](plugin_compatibility.md#exploring-apis-as-a-consumer) process to identify the JAR files under the External Library `Gradle:com.jetbrains:clion:`.
Test your plugin with versions of CLion you intend to support.
diff --git a/topics/products/clion/clion_extension_point_list.md b/topics/products/clion/clion_extension_point_list.md
new file mode 100644
index 000000000..79c5ad422
--- /dev/null
+++ b/topics/products/clion/clion_extension_point_list.md
@@ -0,0 +1,181 @@
+[//]: # (title: CLion Extension Point List)
+
+
+
+82 Extension Points (EP) for CLion
+
+See [Extension Point List](extension_point_list.md) for IntelliJ Platform EPs.
+
+See [Plugin Extensions](plugin_extensions.md) on how to declare extensions in your plugin.
+
+**Extension Point** searches for usages inside existing implementations of open-source IntelliJ Platform plugins via [IntelliJ Platform Explorer](https://jb.gg/ipe).
+
+**Implementation** is related EP class.
+
+#### Note Legend
+
+| Icon | Description | Details |
+|---|---|---|
+|  | Non-Dynamic Extension Point | Installation/update of plugin requires restart ([Dynamic Plugins](dynamic_plugins.md)) |
+|  | Experimental API | Implementation annotated with [`@ApiStatus.Experimental`](https://github.com/JetBrains/java-annotations/blob/master/common/src/main/java/org/jetbrains/annotations/ApiStatus.java), API might be altered or removed without prior notice |
+|  | Internal API | Implementation annotated with [`@ApiStatus.Internal`](https://github.com/JetBrains/java-annotations/blob/master/common/src/main/java/org/jetbrains/annotations/ApiStatus.java), should not be used by 3rd party |
+|  | Project-Level Extension Point | Declared with `area="IDEA_PROJECT"`, can have `Project` as constructor parameter |
+
+## CLion
+
+### CidrCoveragePlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.coverage.coverageComposer](https://jb.gg/ipe?extensions=cidr.coverage.coverageComposer)  | `CidrCoverageComposer` |
+| [cidr.coverage.coverageComposerRunner](https://jb.gg/ipe?extensions=cidr.coverage.coverageComposerRunner)  | `CidrCoverageComposerRunner` |
+| [cidr.coverage.coverageDataFileProvider](https://jb.gg/ipe?extensions=cidr.coverage.coverageDataFileProvider)  | `CidrCoverageDataFileProvider` |
+| [cidr.coverage.coverageErrorProcessor](https://jb.gg/ipe?extensions=cidr.coverage.coverageErrorProcessor)  | `CidrCoverageErrorProcessor` |
+| [cidr.coverage.coverageViewExtensionProvider](https://jb.gg/ipe?extensions=cidr.coverage.coverageViewExtensionProvider)  | `CidrCoverageViewExtensionProvider` |
+| [cidr.coverage.gcovCoverageToolsProvider](https://jb.gg/ipe?extensions=cidr.coverage.gcovCoverageToolsProvider)  | `GCovCoverageToolProvider` |
+| [cidr.coverage.llvmCoverageToolsProvider](https://jb.gg/ipe?extensions=cidr.coverage.llvmCoverageToolsProvider)  | `LLVMCoverageToolsProvider` |
+
+### CidrDebuggerPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.debugger.backendConsoleInjectionHelper](https://jb.gg/ipe?extensions=cidr.debugger.backendConsoleInjectionHelper) | `BackendConsoleInjectionHelper` |
+| [cidr.debugger.customDebuggerProvider](https://jb.gg/ipe?extensions=cidr.debugger.customDebuggerProvider) | `CidrCustomDebuggerProvider` |
+| [cidr.debugger.debugProcessConfigurator](https://jb.gg/ipe?extensions=cidr.debugger.debugProcessConfigurator) | `CidrDebugProcessConfigurator` |
+| [cidr.debugger.editorsExtension](https://jb.gg/ipe?extensions=cidr.debugger.editorsExtension) | `CidrDebuggerEditorsExtension` |
+| [cidr.debugger.formatters.natvis.provider](https://jb.gg/ipe?extensions=cidr.debugger.formatters.natvis.provider) | `NatvisFileProvider` |
+| [cidr.debugger.languageSupport](https://jb.gg/ipe?extensions=cidr.debugger.languageSupport) | `CidrDebuggerLanguageSupport` |
+| [cidr.debugger.lineBreakpointFileTypesProvider](https://jb.gg/ipe?extensions=cidr.debugger.lineBreakpointFileTypesProvider) | `CidrLineBreakpointFileTypesProvider` |
+| [cidr.debugger.valueRendererExtension](https://jb.gg/ipe?extensions=cidr.debugger.valueRendererExtension)  | `ValueRendererExtension` |
+| [cidr.debugger.valueRendererFactory](https://jb.gg/ipe?extensions=cidr.debugger.valueRendererFactory)  | `ValueRendererFactory` |
+
+### CidrDFAPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [dfa.console](https://jb.gg/ipe?extensions=dfa.console) | `Console` |
+
+### CidrExecutionPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.buildConfigurationProvider](https://jb.gg/ipe?extensions=cidr.buildConfigurationProvider) | `CidrBuildConfigurationProvider` |
+| [cidr.projectTaskContextProvider](https://jb.gg/ipe?extensions=cidr.projectTaskContextProvider) | `CidrProjectTaskContextProvider` |
+| [cidr.resolveConfigurationProvider](https://jb.gg/ipe?extensions=cidr.resolveConfigurationProvider) | `CidrResolveConfigurationProvider` |
+| [cidr.runConfigurationExtension](https://jb.gg/ipe?extensions=cidr.runConfigurationExtension)  | `CidrRunConfigurationExtensionBase` |
+| [cidr.targetConfigurationHelper](https://jb.gg/ipe?extensions=cidr.targetConfigurationHelper) | `CidrTargetConfigurationHelper` |
+| [cidr.testFrameworkDetector](https://jb.gg/ipe?extensions=cidr.testFrameworkDetector)  | `CidrTestFrameworkDetector` |
+
+### CidrLangBase.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.lang.fileTypeHelper](https://jb.gg/ipe?extensions=cidr.lang.fileTypeHelper)  | `OCFileTypeHelper` |
+| [cidr.lang.languageKindHelper](https://jb.gg/ipe?extensions=cidr.lang.languageKindHelper)  | `OCLanguageKindCalculatorHelper` |
+| [cidr.lang.languageKindProvider](https://jb.gg/ipe?extensions=cidr.lang.languageKindProvider)  | `OCLanguageKindProvider` |
+| [cidr.lang.newFileLangBackendHandler](https://jb.gg/ipe?extensions=cidr.lang.newFileLangBackendHandler)  | `OCNewFileLangBackendHandler` |
+| [cidr.lang.newFileModelHandlerProvider](https://jb.gg/ipe?extensions=cidr.lang.newFileModelHandlerProvider)  | `OCNewFileProjectModelHandlerProvider` |
+| [cidr.lang.projectWizardFilesFormatter](https://jb.gg/ipe?extensions=cidr.lang.projectWizardFilesFormatter)  | `CidrProjectWizardFilesFormatter` |
+
+### CidrLangPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.lang.annotatorHelper](https://jb.gg/ipe?extensions=cidr.lang.annotatorHelper)  | `OCAnnotatorHelper` |
+| [cidr.lang.autoImportHelper](https://jb.gg/ipe?extensions=cidr.lang.autoImportHelper)  | `OCAutoImportHelper` |
+| [cidr.lang.customHeaderProvider](https://jb.gg/ipe?extensions=cidr.lang.customHeaderProvider)  | `CustomHeaderProvider` |
+| [cidr.lang.doxygenExtension](https://jb.gg/ipe?extensions=cidr.lang.doxygenExtension)  | `Doxygen` |
+| [cidr.lang.externalCompletionProvider](https://jb.gg/ipe?extensions=cidr.lang.externalCompletionProvider)  | `ExternalCompletionProvider` |
+| [cidr.lang.externalInspections](https://jb.gg/ipe?extensions=cidr.lang.externalInspections) | `OCExternalInspections` |
+| [cidr.lang.externalResolver](https://jb.gg/ipe?extensions=cidr.lang.externalResolver) | `OCExternalResolver` |
+| [cidr.lang.fileWideHighlighter](https://jb.gg/ipe?extensions=cidr.lang.fileWideHighlighter)  | `FileWideHighlighter` |
+| [cidr.lang.foreignUsagesRenameProcessor](https://jb.gg/ipe?extensions=cidr.lang.foreignUsagesRenameProcessor)  | `OCForeignUsagesRenameProcessor` |
+| [cidr.lang.groupedFileNaming](https://jb.gg/ipe?extensions=cidr.lang.groupedFileNaming)  | `OCGroupedFileNaming` |
+| [cidr.lang.includeHelper](https://jb.gg/ipe?extensions=cidr.lang.includeHelper)  | `OCIncludeHelper` |
+| [cidr.lang.includeHierarchyProvider](https://jb.gg/ipe?extensions=cidr.lang.includeHierarchyProvider)  | [`HierarchyProvider`](upsource:///platform/lang-api/src/com/intellij/ide/hierarchy/HierarchyProvider.java) |
+| [cidr.lang.initialBuildingActivity](https://jb.gg/ipe?extensions=cidr.lang.initialBuildingActivity)  | `OCInitialBuildingActivity` |
+| [cidr.lang.languageKindContributor](https://jb.gg/ipe?extensions=cidr.lang.languageKindContributor)  | `OCLanguageKindContributor` |
+| [cidr.lang.libraryFileConfigurationProvider](https://jb.gg/ipe?extensions=cidr.lang.libraryFileConfigurationProvider)  | `OCLibraryFileResolveConfigurationProvider` |
+| [cidr.lang.moduleMapManagerRequestor](https://jb.gg/ipe?extensions=cidr.lang.moduleMapManagerRequestor)  | `ModuleMapManagerRequestor` |
+| [cidr.lang.moduleMapSearchRootProvider](https://jb.gg/ipe?extensions=cidr.lang.moduleMapSearchRootProvider)  | `ModuleMapSearchRootProvider` |
+| [cidr.lang.moduleResolver](https://jb.gg/ipe?extensions=cidr.lang.moduleResolver)  | `OCModuleResolver` |
+| [cidr.lang.ocAdditionalFileSymbolTableBuilder](https://jb.gg/ipe?extensions=cidr.lang.ocAdditionalFileSymbolTableBuilder)  | `OCAdditionalFileSymbolTableBuilder` |
+| [cidr.lang.ocDirectInheritorsSearch](https://jb.gg/ipe?extensions=cidr.lang.ocDirectInheritorsSearch)  | [`QueryExecutor`](upsource:///platform/core-api/src/com/intellij/util/QueryExecutor.java) |
+| [cidr.lang.renameHandlerExtension](https://jb.gg/ipe?extensions=cidr.lang.renameHandlerExtension)  | `OCRenameHandlerExtension` |
+| [cidr.lang.renameProcessorExtension](https://jb.gg/ipe?extensions=cidr.lang.renameProcessorExtension)  | `OCRenameProcessorExtension` |
+| [cidr.lang.resourceCompletionProviders](https://jb.gg/ipe?extensions=cidr.lang.resourceCompletionProviders)  | `OCResourceCompletionProviders` |
+| [cidr.lang.resourceFilesProvider](https://jb.gg/ipe?extensions=cidr.lang.resourceFilesProvider)  | `OCResourceFilesProvider` |
+| [cidr.lang.searchHelper](https://jb.gg/ipe?extensions=cidr.lang.searchHelper)  | `OCSearchHelper` |
+| [cidr.lang.serializerProvider](https://jb.gg/ipe?extensions=cidr.lang.serializerProvider)  | `SerializerProvider` |
+| [cidr.lang.standaloneInspectionToolProvider](https://jb.gg/ipe?extensions=cidr.lang.standaloneInspectionToolProvider)  | [`NotNullProducer`](upsource:///platform/util/src/com/intellij/util/NotNullProducer.java) |
+| [cidr.lang.symbolTableProvider](https://jb.gg/ipe?extensions=cidr.lang.symbolTableProvider)  | `SymbolTableProvider` |
+| [cidr.lang.testFramework](https://jb.gg/ipe?extensions=cidr.lang.testFramework)  | `OCTestFramework` |
+| [cidr.lang.typeStructureProvider](https://jb.gg/ipe?extensions=cidr.lang.typeStructureProvider)  | `PolyglotTypeStructureProvider` |
+| [cidr.projectModel.unloadedResolveContextsManager](https://jb.gg/ipe?extensions=cidr.projectModel.unloadedResolveContextsManager) | `OCUnloadedResolveContextsManager` |
+
+### CidrProjectModelPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.lang.appleFrameworkFilter](https://jb.gg/ipe?extensions=cidr.lang.appleFrameworkFilter)  | `AppleFrameworkFilter` |
+| [cidr.lang.compilerKindProvider](https://jb.gg/ipe?extensions=cidr.lang.compilerKindProvider)  | `OCCompilerKindProvider` |
+| [cidr.lang.compilerResolver](https://jb.gg/ipe?extensions=cidr.lang.compilerResolver)  | `OCCompilerResolver` |
+| [cidr.lang.headerSearchRootFactory](https://jb.gg/ipe?extensions=cidr.lang.headerSearchRootFactory) | `HeadersSearchRootFactory` |
+| [cidr.lang.resolveConfigurationSelector](https://jb.gg/ipe?extensions=cidr.lang.resolveConfigurationSelector) | `OCResolveConfigurationSelector` |
+| [cidr.projectModel.deserializingVetoCondition](https://jb.gg/ipe?extensions=cidr.projectModel.deserializingVetoCondition) | `OCWorkspaceDeserializingVetoCondition` |
+| [cidr.projectModel.msvcPchHelper](https://jb.gg/ipe?extensions=cidr.projectModel.msvcPchHelper) | `OCMsvcPchHelper` |
+| [cidr.projectModel.supportedFileChecker](https://jb.gg/ipe?extensions=cidr.projectModel.supportedFileChecker)  | `OCSupportedFileChecker` |
+
+### CidrToolchainsPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.devEnvironmentChecker](https://jb.gg/ipe?extensions=cidr.devEnvironmentChecker)  | `DevEnvironmentChecker` |
+
+### CidrWorkspaceModelCore.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.project.is.known.checker](https://jb.gg/ipe?extensions=cidr.project.is.known.checker)  | `KnownProjectChecker` |
+| [cidr.project.workspaceProvider](https://jb.gg/ipe?extensions=cidr.project.workspaceProvider)  | `CidrWorkspaceProvider` |
+
+### CidrWorkspaceModelIde.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.markRootActionAvailability](https://jb.gg/ipe?extensions=cidr.markRootActionAvailability)  | `CidrMarkRootActionAvailability` |
+
+### CLionCMakeCore.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [com.intellij.cmake.runnerStep](https://jb.gg/ipe?extensions=com.intellij.cmake.runnerStep)  | `CMakeRunnerStep` |
+| [com.intellij.cmake.targetToConfigProvider](https://jb.gg/ipe?extensions=com.intellij.cmake.targetToConfigProvider) | `CMakeTargetToConfigProvider` |
+
+### CLionExecutionPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [clion.buildToolWindowActivator.contributor](https://jb.gg/ipe?extensions=clion.buildToolWindowActivator.contributor) | `Contributor` |
+| [clion.compoundConfigurationContext](https://jb.gg/ipe?extensions=clion.compoundConfigurationContext) | `CidrCompoundConfigurationContext` |
+| [clion.externalConfigurationProvider](https://jb.gg/ipe?extensions=clion.externalConfigurationProvider) | `CLionExternalConfigurationProvider` |
+
+### CLionWizard.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [cidr.openWizardStepProvider](https://jb.gg/ipe?extensions=cidr.openWizardStepProvider) | `OpenWizardStepProvider` |
+
+### CMakePsiPlugin.xml
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [com.intellij.cmake.completion.environmentProvider](https://jb.gg/ipe?extensions=com.intellij.cmake.completion.environmentProvider)  | `CMakeEnvironmentVariableProvider` |
+| [com.intellij.cmake.fileLocationProvider](https://jb.gg/ipe?extensions=com.intellij.cmake.fileLocationProvider)  | `CMakeFileLocationProvider` |
+
+### com.intellij.cidr.lang.clangd
+
+| Extension Point | Implementation |
+|-----------------|----------------|
+| [com.intellij.cidrCommandLineParser](https://jb.gg/ipe?extensions=com.intellij.cidrCommandLineParser)  | `CidrCommandLineParser` |
+| [com.intellij.clangFormatProvider](https://jb.gg/ipe?extensions=com.intellij.clangFormatProvider)  | `ClangFormatChangeSettingsProvider` |