MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate direct createFileFromText() method overriding

Browse Source 
The only allowed solution is to implement LanguageCodeStyleSettingsProvider.createFileFromText().
This commit is contained in:
Rustam Vishnyakov
2017-10-04 14:40:01 +03:00
parent 1de1fbc86f
commit e6dd678660
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
+12
View File
@@ -218,6 +218,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
}
//important not mark as generated not to get the classes before setting language level
@SuppressWarnings("deprecation")
PsiFile psiFile = createFileFromText(project, myTextToReformat);
prepareForReformat(psiFile);
@@ -267,6 +268,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
*/
@Nullable
private Document collectChangesBeforeCurrentSettingsAppliance(Project project) {
@SuppressWarnings("deprecation")
PsiFile psiFile = createFileFromText(project, myTextToReformat);
prepareForReformat(psiFile);
CodeStyleSettings clone = mySettings.clone();
@@ -303,7 +305,17 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
return getFileTypeExtension(getFileType());
}
/**
* @deprecated Do not override this method. Use LanguageCodeStyleSettingsProvider.createFileFromText() instead.
* @see LanguageCodeStyleSettingsProvider#createFileFromText(Project, String)
*/
@Deprecated
protected PsiFile createFileFromText(Project project, String text) {
Language language = getDefaultLanguage();
if (language != null) {
final PsiFile file = LanguageCodeStyleSettingsProvider.createFileFromText(language, project, text);
if (file != null) return file;
}
return PsiFileFactory.getInstance(project).createFileFromText(
"a." + getFileExt(), getFileType(), text, LocalTimeCounter.currentTime(), false
);
platform/lang-impl/src/com/intellij/application/options/codeStyle/CustomizableLanguageCodeStylePanel.java
-6
View File
@@ -85,12 +85,6 @@ public abstract class CustomizableLanguageCodeStylePanel extends CodeStyleAbstra
return sample;
}
@Override
protected PsiFile createFileFromText(final Project project, final String text) {
final PsiFile file = LanguageCodeStyleSettingsProvider.createFileFromText(getDefaultLanguage(), project, text);
return file != null ? file : super.createFileFromText(project, text);
}
@Override
protected int getRightMargin() {
if (getDefaultLanguage() == null) return -1;