diff --git a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java index bdcc3f11188f..ef89a6cc70be 100644 --- a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java +++ b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java @@ -31,8 +31,8 @@ public class ClassFileViewProvider extends SingleRootFileViewProvider { super(manager, file); } - public ClassFileViewProvider(@NotNull final PsiManager manager, @NotNull final VirtualFile virtualFile, final boolean physical) { - super(manager, virtualFile, physical); + public ClassFileViewProvider(@NotNull final PsiManager manager, @NotNull final VirtualFile virtualFile, final boolean eventSystemEnabled) { + super(manager, virtualFile, eventSystemEnabled); } @Override diff --git a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java index d9b77117801d..de870b9cfcbf 100644 --- a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java +++ b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java @@ -29,20 +29,20 @@ import static com.intellij.psi.compiled.ClassFileDecompilers.Full; */ public class ClassFileViewProviderFactory implements FileViewProviderFactory { @Override - public FileViewProvider createFileViewProvider(@NotNull VirtualFile file, Language language, @NotNull PsiManager manager, boolean physical) { + public FileViewProvider createFileViewProvider(@NotNull VirtualFile file, Language language, @NotNull PsiManager manager, boolean eventSystemEnabled) { ClassFileDecompilers.Decompiler decompiler = ClassFileDecompilers.find(file); if (decompiler instanceof Full) { - return ((Full)decompiler).createFileViewProvider(file, manager, physical); + return ((Full)decompiler).createFileViewProvider(file, manager, eventSystemEnabled); } for (ContentBasedFileSubstitutor processor : Extensions.getExtensions(ContentBasedFileSubstitutor.EP_NAME)) { Language lang = processor.obtainLanguageForFile(file); if (lang != null) { FileViewProviderFactory factory = LanguageFileViewProviders.INSTANCE.forLanguage(language); - return factory.createFileViewProvider(file, language, manager, physical); + return factory.createFileViewProvider(file, language, manager, eventSystemEnabled); } } - return new ClassFileViewProvider(manager, file, physical); + return new ClassFileViewProvider(manager, file, eventSystemEnabled); } } \ No newline at end of file diff --git a/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java b/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java index 4fe3ecdaae78..60fdf43dad58 100644 --- a/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java +++ b/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java @@ -26,5 +26,5 @@ import org.jetbrains.annotations.NotNull; * @author yole */ public interface FileViewProviderFactory { - FileViewProvider createFileViewProvider(@NotNull VirtualFile file, Language language, @NotNull PsiManager manager, boolean physical); + FileViewProvider createFileViewProvider(@NotNull VirtualFile file, Language language, @NotNull PsiManager manager, boolean eventSystemEnabled); } \ No newline at end of file diff --git a/platform/core-api/src/com/intellij/psi/PsiFileFactory.java b/platform/core-api/src/com/intellij/psi/PsiFileFactory.java index b96a0fbddba9..b31c03b6640a 100644 --- a/platform/core-api/src/com/intellij/psi/PsiFileFactory.java +++ b/platform/core-api/src/com/intellij/psi/PsiFileFactory.java @@ -55,19 +55,19 @@ public abstract class PsiFileFactory { @NotNull public abstract PsiFile createFileFromText(@NonNls @NotNull String name, @NotNull FileType fileType, @NotNull CharSequence text, - long modificationStamp, boolean physical); + long modificationStamp, boolean eventSystemEnabled); @NotNull public abstract PsiFile createFileFromText(@NonNls @NotNull String name, @NotNull FileType fileType, @NotNull CharSequence text, - long modificationStamp, boolean physical, boolean markAsCopy); + long modificationStamp, boolean eventSystemEnabled, boolean markAsCopy); public abstract PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text); public abstract PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, - boolean physical, boolean markAsCopy); + boolean eventSystemEnabled, boolean markAsCopy); public abstract PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, - boolean physical, boolean markAsCopy, boolean noSizeLimit); + boolean eventSystemEnabled, boolean markAsCopy, boolean noSizeLimit); public abstract PsiFile createFileFromText(FileType fileType, String fileName, CharSequence chars, int startOffset, int endOffset); diff --git a/platform/core-impl/src/com/intellij/psi/MultiplePsiFilesPerDocumentFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/MultiplePsiFilesPerDocumentFileViewProvider.java index 0d0e16ce4967..c6554f83fb7a 100644 --- a/platform/core-impl/src/com/intellij/psi/MultiplePsiFilesPerDocumentFileViewProvider.java +++ b/platform/core-impl/src/com/intellij/psi/MultiplePsiFilesPerDocumentFileViewProvider.java @@ -42,8 +42,8 @@ public abstract class MultiplePsiFilesPerDocumentFileViewProvider extends Single private final ConcurrentMap myRoots = new ConcurrentHashMap(1, ConcurrentHashMap.DEFAULT_LOAD_FACTOR, 1); private MultiplePsiFilesPerDocumentFileViewProvider myOriginal = null; - public MultiplePsiFilesPerDocumentFileViewProvider(PsiManager manager, VirtualFile virtualFile, boolean physical) { - super(manager, virtualFile, physical, Language.ANY); + public MultiplePsiFilesPerDocumentFileViewProvider(PsiManager manager, VirtualFile virtualFile, boolean eventSystemEnabled) { + super(manager, virtualFile, eventSystemEnabled, Language.ANY); } @Override diff --git a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java index 742483a8d5ab..777eea35a1a5 100644 --- a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java +++ b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java @@ -77,14 +77,14 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi this(manager, file, true); } - public SingleRootFileViewProvider(@NotNull PsiManager manager, @NotNull VirtualFile virtualFile, final boolean physical) { - this(manager, virtualFile, physical, calcBaseLanguage(virtualFile, manager.getProject())); + public SingleRootFileViewProvider(@NotNull PsiManager manager, @NotNull VirtualFile virtualFile, final boolean eventSystemEnabled) { + this(manager, virtualFile, eventSystemEnabled, calcBaseLanguage(virtualFile, manager.getProject())); } - protected SingleRootFileViewProvider(@NotNull PsiManager manager, @NotNull VirtualFile virtualFile, final boolean physical, @NotNull Language language) { + protected SingleRootFileViewProvider(@NotNull PsiManager manager, @NotNull VirtualFile virtualFile, final boolean eventSystemEnabled, @NotNull Language language) { myManager = manager; myVirtualFile = virtualFile; - myEventSystemEnabled = physical; + myEventSystemEnabled = eventSystemEnabled; myBaseLanguage = language; setContent(new VirtualFileContent()); myPhysical = isEventSystemEnabled() && diff --git a/platform/core-impl/src/com/intellij/psi/impl/EmptyFileManager.java b/platform/core-impl/src/com/intellij/psi/impl/EmptyFileManager.java index c415487237ed..8479be924ee7 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/EmptyFileManager.java +++ b/platform/core-impl/src/com/intellij/psi/impl/EmptyFileManager.java @@ -78,8 +78,8 @@ class EmptyFileManager implements FileManager { @Override @NotNull - public FileViewProvider createFileViewProvider(@NotNull final VirtualFile file, final boolean physical) { - return new SingleRootFileViewProvider(myManager, file, physical); + public FileViewProvider createFileViewProvider(@NotNull final VirtualFile file, final boolean eventSystemEnabled) { + return new SingleRootFileViewProvider(myManager, file, eventSystemEnabled); } @Override diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiFileFactoryImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiFileFactoryImpl.java index 39e302c73ac5..a24a942bcfea 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiFileFactoryImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/PsiFileFactoryImpl.java @@ -51,8 +51,8 @@ public class PsiFileFactoryImpl extends PsiFileFactory { @Override @NotNull public PsiFile createFileFromText(@NotNull String name, @NotNull FileType fileType, @NotNull CharSequence text, - long modificationStamp, final boolean physical) { - return createFileFromText(name, fileType, text, modificationStamp, physical, true); + long modificationStamp, final boolean eventSystemEnabled) { + return createFileFromText(name, fileType, text, modificationStamp, eventSystemEnabled, true); } @Override @@ -61,22 +61,22 @@ public class PsiFileFactoryImpl extends PsiFileFactory { } @Override - public PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, boolean physical, boolean markAsCopy) { - return createFileFromText(name, language, text, physical, markAsCopy, false); + public PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, boolean eventSystemEnabled, boolean markAsCopy) { + return createFileFromText(name, language, text, eventSystemEnabled, markAsCopy, false); } @Override public PsiFile createFileFromText(@NotNull String name, @NotNull Language language, @NotNull CharSequence text, - boolean physical, + boolean eventSystemEnabled, boolean markAsCopy, boolean noSizeLimit) { LightVirtualFile virtualFile = new LightVirtualFile(name, language, text); if (noSizeLimit) { SingleRootFileViewProvider.doNotCheckFileSizeLimit(virtualFile); } - return trySetupPsiForFile(virtualFile, language, physical, markAsCopy); + return trySetupPsiForFile(virtualFile, language, eventSystemEnabled, markAsCopy); } @Override @@ -85,17 +85,17 @@ public class PsiFileFactoryImpl extends PsiFileFactory { @NotNull FileType fileType, @NotNull CharSequence text, long modificationStamp, - final boolean physical, + final boolean eventSystemEnabled, boolean markAsCopy) { final LightVirtualFile virtualFile = new LightVirtualFile(name, fileType, text, modificationStamp); if(fileType instanceof LanguageFileType){ final Language language = LanguageSubstitutors.INSTANCE.substituteLanguage(((LanguageFileType)fileType).getLanguage(), virtualFile, myManager.getProject()); - final PsiFile file = trySetupPsiForFile(virtualFile, language, physical, markAsCopy); + final PsiFile file = trySetupPsiForFile(virtualFile, language, eventSystemEnabled, markAsCopy); if (file != null) return file; } final SingleRootFileViewProvider singleRootFileViewProvider = - new SingleRootFileViewProvider(myManager, virtualFile, physical); + new SingleRootFileViewProvider(myManager, virtualFile, eventSystemEnabled); final PsiPlainTextFileImpl plainTextFile = new PsiPlainTextFileImpl(singleRootFileViewProvider); if(markAsCopy) CodeEditUtil.setNodeGenerated(plainTextFile.getNode(), true); return plainTextFile; diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManager.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManager.java index 4a94b3adb40b..b95946c1d5e2 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManager.java +++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManager.java @@ -50,5 +50,5 @@ public interface FileManager extends Disposable { List getAllCachedFiles(); @NotNull - FileViewProvider createFileViewProvider(@NotNull VirtualFile file, boolean physical); + FileViewProvider createFileViewProvider(@NotNull VirtualFile file, boolean eventSystemEnabled); } diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java index 2e94b48e4b7a..60b19f3d76fa 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java @@ -193,14 +193,14 @@ public class FileManagerImpl implements FileManager { @Override @NotNull - public FileViewProvider createFileViewProvider(@NotNull final VirtualFile file, boolean physical) { + public FileViewProvider createFileViewProvider(@NotNull final VirtualFile file, boolean eventSystemEnabled) { Language language = getLanguage(file); final FileViewProviderFactory factory = language == null ? FileTypeFileViewProviders.INSTANCE.forFileType(file.getFileType()) : LanguageFileViewProviders.INSTANCE.forLanguage(language); - FileViewProvider viewProvider = factory == null ? null : factory.createFileViewProvider(file, language, myManager, physical); + FileViewProvider viewProvider = factory == null ? null : factory.createFileViewProvider(file, language, myManager, eventSystemEnabled); - return viewProvider == null ? new SingleRootFileViewProvider(myManager, file, physical) : viewProvider; + return viewProvider == null ? new SingleRootFileViewProvider(myManager, file, eventSystemEnabled) : viewProvider; } @Nullable diff --git a/platform/lang-impl/src/com/intellij/mock/MockFileManager.java b/platform/lang-impl/src/com/intellij/mock/MockFileManager.java index f5cb2e19c236..2197dff2b9fa 100644 --- a/platform/lang-impl/src/com/intellij/mock/MockFileManager.java +++ b/platform/lang-impl/src/com/intellij/mock/MockFileManager.java @@ -42,8 +42,8 @@ public class MockFileManager implements FileManager { @Override @NotNull - public FileViewProvider createFileViewProvider(@NotNull final VirtualFile file, final boolean physical) { - return new SingleRootFileViewProvider(myManager, file, physical); + public FileViewProvider createFileViewProvider(@NotNull final VirtualFile file, final boolean eventSystemEnabled) { + return new SingleRootFileViewProvider(myManager, file, eventSystemEnabled); } public MockFileManager(final PsiManagerEx manager) { diff --git a/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java b/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java index 121ef6ecd8f4..5c61251d9ba6 100644 --- a/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java +++ b/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; */ public class RestFileProviderFactory implements FileViewProviderFactory { - public FileViewProvider createFileViewProvider(@NotNull VirtualFile virtualFile, Language language, @NotNull PsiManager psiManager, boolean physical) { - return new RestFileViewProvider(psiManager, virtualFile, physical); + public FileViewProvider createFileViewProvider(@NotNull VirtualFile virtualFile, Language language, @NotNull PsiManager psiManager, boolean eventSystemEnabled) { + return new RestFileViewProvider(psiManager, virtualFile, eventSystemEnabled); } }