MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

CPP-44970 Enable ClangFormat without creating .clangformat file doesn't change status bar

Browse Source 
- restore indent detection on front end


(cherry picked from commit 2f63fe3ddf5e6be30baded169f43bc7bcb2ac5d2)

IJ-CR-170723

GitOrigin-RevId: 0ff44b51b185c64ad83a14dff300dc219de773d0
This commit is contained in:
Alexey Utkin
2025-06-24 22:32:09 +04:00
committed by intellij-monorepo-bot
parent 5a7dd9c1d2
commit 742bef79da
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/code-style-api/api-dump-experimental.txt
View File

@@ -28,6 +28,7 @@ c:com.intellij.psi.codeStyle.PackageEntry
- *sf:ALL_MODULE_IMPORTS:com.intellij.psi.codeStyle.PackageEntry - *sf:ALL_MODULE_IMPORTS:com.intellij.psi.codeStyle.PackageEntry
*:com.intellij.psi.codeStyle.modifier.CodeStyleSettingsModifier *:com.intellij.psi.codeStyle.modifier.CodeStyleSettingsModifier
- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
- acceptsFileIndentOptionsProviders():Z
- getActivatingAction(com.intellij.psi.codeStyle.modifier.CodeStyleStatusBarUIContributor,com.intellij.psi.PsiFile):com.intellij.openapi.actionSystem.AnAction - getActivatingAction(com.intellij.psi.codeStyle.modifier.CodeStyleStatusBarUIContributor,com.intellij.psi.PsiFile):com.intellij.openapi.actionSystem.AnAction
- getDisablingFunction(com.intellij.openapi.project.Project):java.util.function.Consumer - getDisablingFunction(com.intellij.openapi.project.Project):java.util.function.Consumer
- a:getName():java.lang.String - a:getName():java.lang.String

5
platform/code-style-api/src/com/intellij/psi/codeStyle/modifier/CodeStyleSettingsModifier.java
View File

@@ -91,4 +91,9 @@ public interface CodeStyleSettingsModifier {
default @Nullable AnAction getActivatingAction(@Nullable CodeStyleStatusBarUIContributor activeUiContributor, @NotNull PsiFile file) { default @Nullable AnAction getActivatingAction(@Nullable CodeStyleStatusBarUIContributor activeUiContributor, @NotNull PsiFile file) {
return null; return null;
} }
/**
* @return {@code true} if the modifier accepts file indent providers, {@code false} otherwise.
*/
default boolean acceptsFileIndentOptionsProviders() { return false; }
} }

8
platform/code-style-api/src/com/intellij/psi/codeStyle/modifier/TransientCodeStyleSettings.java
View File

@@ -73,11 +73,15 @@ public final class TransientCodeStyleSettings extends CodeStyleSettings {
@Override @Override
public @NotNull IndentOptions getIndentOptionsByFile(@NotNull Project project, public @NotNull IndentOptions getIndentOptionsByFile(@NotNull Project project,
@Nullable VirtualFile file, @NotNull VirtualFile file,
@Nullable TextRange formatRange, @Nullable TextRange formatRange,
boolean ignoreDocOptions, boolean ignoreDocOptions,
@Nullable Processor<? super FileIndentOptionsProvider> providerProcessor) { @Nullable Processor<? super FileIndentOptionsProvider> providerProcessor) {
if (file != null && file.isValid()) { if (myModifier != null && myModifier.acceptsFileIndentOptionsProviders()) {
return super.getIndentOptionsByFile(project, file, formatRange, ignoreDocOptions, providerProcessor);
}
if (file.isValid()) {
FileType fileType = file.getFileType(); FileType fileType = file.getFileType();
return getIndentOptions(fileType); return getIndentOptions(fileType);
} }

1
platform/lang-impl/api-dump-experimental.txt
View File

@@ -802,6 +802,7 @@ f:com.intellij.platform.ide.documentation.ActionsKt
*f:com.intellij.psi.codeStyle.DetectableIndentSettingsModifier *f:com.intellij.psi.codeStyle.DetectableIndentSettingsModifier
- com.intellij.psi.codeStyle.modifier.CodeStyleSettingsModifier - com.intellij.psi.codeStyle.modifier.CodeStyleSettingsModifier
- <init>():V - <init>():V
- acceptsFileIndentOptionsProviders():Z
- getDisablingFunction(com.intellij.openapi.project.Project):java.util.function.Consumer - getDisablingFunction(com.intellij.openapi.project.Project):java.util.function.Consumer
- getName():java.lang.String - getName():java.lang.String
- getStatusBarUiContributor(com.intellij.psi.codeStyle.modifier.TransientCodeStyleSettings):com.intellij.psi.codeStyle.modifier.CodeStyleStatusBarUIContributor - getStatusBarUiContributor(com.intellij.psi.codeStyle.modifier.TransientCodeStyleSettings):com.intellij.psi.codeStyle.modifier.CodeStyleStatusBarUIContributor

2
platform/lang-impl/src/com/intellij/psi/codeStyle/DetectableIndentSettingsModifier.kt
View File

@@ -35,4 +35,6 @@ class DetectableIndentSettingsModifier : CodeStyleSettingsModifier {
override fun getStatusBarUiContributor(transientSettings: TransientCodeStyleSettings): CodeStyleStatusBarUIContributor? = null override fun getStatusBarUiContributor(transientSettings: TransientCodeStyleSettings): CodeStyleStatusBarUIContributor? = null
override fun mayOverrideSettingsOf(project: Project): Boolean = CodeStyle.getSettings(project).AUTODETECT_INDENTS override fun mayOverrideSettingsOf(project: Project): Boolean = CodeStyle.getSettings(project).AUTODETECT_INDENTS
override fun acceptsFileIndentOptionsProviders(): Boolean = true
} }