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

IDEA-143597 New behavior of creating Scratch Files is distracting

Browse Source
This commit is contained in:
Gregory.Shrago
2015-08-18 02:58:32 +03:00
parent 141aa97ad0
commit a5cd6ac610
6 changed files with 92 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/scratch/LRUPopupBuilder.java
+2 -6
View File
@@ -63,18 +63,14 @@ public abstract class LRUPopupBuilder<T> {
@NotNull
public static ListPopup forFileLanguages(@NotNull Project project, @NotNull final Iterable<VirtualFile> files, @NotNull final PerFileMappings<Language> mappings) {
Consumer<Language> onChosen = new Consumer<Language>() {
return forFileLanguages(project, null, new Consumer<Language>() {
@Override
public void consume(Language t) {
for (VirtualFile file : files) {
mappings.setMapping(file, t);
}
}
};
return languagePopupBuilder(project, "Languages").
forValues(mappings.getAvailableValues(null)).
onChosen(onChosen).
buildPopup();
});
}
@NotNull
platform/lang-impl/src/com/intellij/ide/scratch/NewScratchFileAction.java → platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java
+70 -42
View File
@@ -22,12 +22,9 @@ import com.intellij.lang.StdLanguages;
import com.intellij.lang.injection.InjectedLanguageManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
@@ -38,6 +35,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.LanguageSubstitutors;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.Consumer;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
@@ -52,38 +50,89 @@ import static com.intellij.openapi.util.Conditions.*;
/**
* @author ignatov
*/
public class NewScratchFileAction extends DumbAwareAction {
public class ScratchFileActions {
@Override
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabledAndVisible(isEnabled(e));
public static class NewFileAction extends DumbAwareAction {
@Override
public void update(@NotNull AnActionEvent e) {
boolean enabled = e.getProject() != null && Registry.is("ide.scratch.enabled");
e.getPresentation().setEnabledAndVisible(enabled);
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
final Project project = e.getProject();
if (project == null) return;
PsiFile file = e.getData(CommonDataKeys.PSI_FILE);
Editor editor = e.getData(CommonDataKeys.EDITOR);
final String text = StringUtil.notNullize(getSelectionText(editor));
Language language = text.isEmpty() ? null : getLanguageFromCaret(project, editor, file);
Consumer<Language> consumer = new Consumer<Language>() {
@Override
public void consume(Language language) {
doCreateNewScratch(project, false, language, text);
}
};
if (language != null) {
consumer.consume(language);
}
else {
LRUPopupBuilder.forFileLanguages(project, null, consumer).showCenteredInCurrentWindow(project);
}
}
}
public static boolean isEnabled(@NotNull AnActionEvent e) {
return e.getProject() != null && Registry.is("ide.scratch.enabled");
public static class NewBufferAction extends DumbAwareAction {
@Override
public void update(@NotNull AnActionEvent e) {
boolean enabled = e.getProject() != null && Registry.is("ide.scratch.enabled") && Registry.intValue("ide.scratch.buffers") > 0;
e.getPresentation().setEnabledAndVisible(enabled);
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
Project project = e.getProject();
if (project == null) return;
PsiFile file = e.getData(CommonDataKeys.PSI_FILE);
Editor editor = e.getData(CommonDataKeys.EDITOR);
String text = StringUtil.notNullize(getSelectionText(editor));
Language language = text.isEmpty() ? null : getLanguageFromCaret(project, editor, file);
doCreateNewScratch(project, true, ObjectUtils.notNull(language, StdLanguages.TEXT), text);
}
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
final Project project = e.getProject();
if (project == null) return;
PsiFile file = e.getData(CommonDataKeys.PSI_FILE);
Editor editor = e.getData(CommonDataKeys.EDITOR);
static void doCreateNewScratch(@NotNull Project project, boolean buffer, @NotNull Language language, @NotNull String text) {
FeatureUsageTracker.getInstance().triggerFeatureUsed("scratch");
String text = StringUtil.notNullize(getSelectionText(editor));
Language language = ObjectUtils.notNull(text.isEmpty() ? null : getLanguageFromCaret(project, editor, file), Language.ANY);
openNewFile(project, language, text);
String fileName = buffer ? "buffer" + nextBufferIndex() : "scratch";
ScratchFileService.Option option = buffer ? ScratchFileService.Option.create_if_missing : ScratchFileService.Option.create_new_always;
VirtualFile f = ScratchRootType.getInstance().createScratchFile(project, fileName, language, text, option);
if (f != null) {
FileEditorManager.getInstance(project).openFile(f, true);
}
}
private static int ourCurrentBuffer = 0;
private static int nextBufferIndex() {
ourCurrentBuffer = (ourCurrentBuffer % Registry.intValue("ide.scratch.buffers")) + 1;
return ourCurrentBuffer;
}
@Nullable
public String getSelectionText(@Nullable Editor editor) {
static String getSelectionText(@Nullable Editor editor) {
if (editor == null) return null;
return editor.getSelectionModel().getSelectedText();
}
@Nullable
public Language getLanguageFromCaret(@NotNull Project project,
static Language getLanguageFromCaret(@NotNull Project project,
@Nullable Editor editor,
@Nullable PsiFile psiFile) {
if (editor == null || psiFile == null) return null;
@@ -94,27 +143,6 @@ public class NewScratchFileAction extends DumbAwareAction {
return file.getLanguage();
}
public static VirtualFile openNewFile(@NotNull final Project project, @NotNull Language language, @NotNull String text) {
FeatureUsageTracker.getInstance().triggerFeatureUsed("scratch");
Language initialLanguage = language == Language.ANY ? StdLanguages.TEXT : language;
final VirtualFile file = ScratchRootType.getInstance().createScratchFile(project, "scratch", initialLanguage, text);
if (file != null) {
FileEditor[] editors = FileEditorManager.getInstance(project).openFile(file, true);
if (language == Language.ANY && editors.length != 0 && editors[0] instanceof TextEditor) {
final TextEditor textEditor = (TextEditor)editors[0];
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (!textEditor.isValid()) return;
PerFileMappings<Language> mappings = ScratchFileService.getInstance().getScratchesMapping();
LRUPopupBuilder.forFileLanguages(project, JBIterable.of(file), mappings).showInBestPositionFor(textEditor.getEditor());
}
});
}
}
return file;
}
@NotNull
private static Function<VirtualFile, RootType> ROOT_TYPE(final ScratchFileService service) {
return new Function<VirtualFile, RootType>() {
platform/lang-impl/src/com/intellij/ide/scratch/ScratchRootType.java
+11 -2
View File
@@ -60,7 +60,17 @@ public final class ScratchRootType extends RootType {
return LayeredIcon.create(icon, AllIcons.Actions.Scratch);
}
@Nullable
public VirtualFile createScratchFile(Project project, final String fileName, final Language language, final String text) {
return createScratchFile(project, fileName, language, text, ScratchFileService.Option.create_new_always);
}
@Nullable
public VirtualFile createScratchFile(Project project,
final String fileName,
final Language language,
final String text,
final ScratchFileService.Option option) {
RunResult<VirtualFile> result =
new WriteCommandAction<VirtualFile>(project, UIBundle.message("file.chooser.create.new.file.command.name")) {
@Override
@@ -76,11 +86,10 @@ public final class ScratchRootType extends RootType {
@Override
protected void run(@NotNull Result<VirtualFile> result) throws Throwable {
ScratchFileService fileService = ScratchFileService.getInstance();
VirtualFile file = fileService.findFile(ScratchRootType.this, "scratch", ScratchFileService.Option.create_new_always);
VirtualFile file = fileService.findFile(ScratchRootType.this, fileName, option);
fileService.getScratchesMapping().setMapping(file, language);
VfsUtil.saveText(file, text);
result.setResult(file);
}
}.execute();
if (result.hasException()) {
platform/platform-resources-en/src/messages/ActionsBundle.properties
+2
View File
@@ -581,6 +581,8 @@ action.IdeScriptingConsole.text=IDE Scripting Console
action.IdeScriptingConsole.description=Open IDE scripting console
action.NewScratchFile.text=New Scratch File...
action.NewScratchFile.description=Creates new scratch file with chosen language
action.NewScratchBuffer.text=New Scratch Buffer
action.NewScratchBuffer.description=Creates new or reuses existing scratch buffer
action.Scratch.ChangeLanguage.text=Change File Language
action.Scratch.ChangeLanguage.description=Change File Language
group.RefactoringMenu.text=_Refactor
platform/platform-resources/src/idea/LangActions.xml
+3 -2
View File
@@ -346,10 +346,11 @@
<add-to-group group-id="ToolsMenu" anchor="first"/>
<action id="NewScratchFile" class="com.intellij.ide.scratch.NewScratchFileAction" />
<action id="NewScratchFile" class="com.intellij.ide.scratch.ScratchFileActions$NewFileAction" />
<action id="IdeScriptingConsole" class="com.intellij.execution.console.RunIdeConsoleAction"/>
</group>
<action id="Scratch.ChangeLanguage" class="com.intellij.ide.scratch.NewScratchFileAction$LanguageAction">
<action id="NewScratchBuffer" class="com.intellij.ide.scratch.ScratchFileActions$NewBufferAction"/>
<action id="Scratch.ChangeLanguage" class="com.intellij.ide.scratch.ScratchFileActions$LanguageAction">
<add-to-group group-id="EditorPopupMenu2"/>
</action>
platform/util/resources/misc/registry.properties
+4 -1
View File
@@ -454,7 +454,10 @@ new.retina.detection=false
new.retina.detection.description=New implementation to detect retina devices
ide.scratch.enabled=true
ide.scratch.enabled.description=Disables Tools > Scratchpad: temporary editor without persistence
ide.scratch.enabled.description=Disables scratch files and buffers
ide.scratch.buffers=5
ide.scratch.buffers.description=Number of scratch buffer files
ide.show.progress.without.status.bar=true
ide.show.progress.without.status.bar.description=Disables transparent progress indicator when status bar is switched off