From 9929113aedf2c0dff132f8ed8f103adbe5fdcd3b Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 28 Apr 2014 12:44:55 +0200 Subject: [PATCH] IDEA-124394 Exception while creating New File w/o extension --- .../src/com/intellij/ide/actions/CreateFileAction.java | 7 +------ .../openapi/fileTypes/impl/FileTypeManagerImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java index 56d22849979e..60d85dcc27d3 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java @@ -170,12 +170,7 @@ public class CreateFileAction extends CreateElementActionBase implements DumbAwa final PsiDirectory psiDirectory = getDirectory(); - final FileType type = FileTypeChooser.getKnownFileTypeOrAssociate(new FakeVirtualFile(psiDirectory.getVirtualFile(), getFileName(inputString)) { - @Override - public boolean isDirectory() { - return false; - } - }, + final FileType type = FileTypeChooser.getKnownFileTypeOrAssociate(new FakeVirtualFile(psiDirectory.getVirtualFile(), getFileName(inputString)), psiDirectory.getProject()); return type != null && super.canClose(getFileName(inputString)); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index 738aad112932..893000b7d47d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -44,6 +44,7 @@ import com.intellij.openapi.vfs.newvfs.FileAttribute; import com.intellij.openapi.vfs.newvfs.FileSystemInterface; import com.intellij.openapi.vfs.newvfs.events.VFileCreateEvent; import com.intellij.openapi.vfs.newvfs.events.VFileEvent; +import com.intellij.openapi.vfs.newvfs.impl.StubVirtualFile; import com.intellij.psi.SingleRootFileViewProvider; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.*; @@ -407,7 +408,9 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME fileType = getFileTypeByFileName(file.getNameSequence()); if (fileType != UnknownFileType.INSTANCE) return fileType; - fileType = getOrDetectFromContent(file); + if (!(file instanceof StubVirtualFile)) { + fileType = getOrDetectFromContent(file); + } return fileType; }