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

reenable daemon for default project

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-09-20 16:46:21 +04:00
parent c90a0ae598
commit 61fa07e2dd
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
+2 -10
View File
@@ -147,18 +147,9 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
Disposer.register(project, myFileStatusMap);
DaemonProgressIndicator.setDebug(LOG.isDebugEnabled());
assert !myInitialized : "Double Initializing";
Disposer.register(myProject, new StatusBarUpdater(myProject));
//myDaemonListeners = new DaemonListeners(myProject, this, editorTracker, editorFactory,
// psiDocumentManager, commandProcessor,
// editorColorsManager, application,
// inspectionProfileManager, inspectionProjectProfileManager,
// todoConfiguration, actionManagerEx,
// virtualFileManager, namedScopeManager,
// dependencyValidationManager);
//Disposer.register(myProject, myDaemonListeners);
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
@@ -782,7 +773,8 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
}
public boolean canChangeFileSilently(@NotNull PsiFileSystemItem file) {
return DaemonListeners.getInstance(myProject).canChangeFileSilently(file);
DaemonListeners listeners = DaemonListeners.getInstance(myProject);
return listeners == null || listeners.canChangeFileSilently(file);
}
@Override
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
+3 -2
View File
@@ -145,6 +145,8 @@ public class DaemonListeners implements Disposable {
myVcsDirtyScopeManager = vcsDirtyScopeManager;
myFileStatusManager = fileStatusManager;
myActionManager = actionManagerEx;
myTooltipController = tooltipController;
boolean replaced = ((UserDataHolderEx)myProject).replace(DAEMON_INITIALIZED, null, Boolean.TRUE);
LOG.assertTrue(replaced, "Daemon listeners already initialized for the project "+myProject);
@@ -152,8 +154,8 @@ public class DaemonListeners implements Disposable {
myDaemonEventPublisher = messageBus.syncPublisher(DaemonCodeAnalyzer.DAEMON_EVENT_TOPIC);
final MessageBusConnection connection = messageBus.connect();
if (project.isDefault()) return;
EditorEventMulticaster eventMulticaster = editorFactory.getEventMulticaster();
eventMulticaster.addDocumentListener(new DocumentAdapter() {
// clearing highlighters before changing document because change can damage editor highlighters drastically, so we'll clear more than necessary
@Override
@@ -185,7 +187,6 @@ public class DaemonListeners implements Disposable {
}, this);
eventMulticaster.addEditorMouseMotionListener(new MyEditorMouseMotionListener(), this);
myTooltipController = tooltipController;
eventMulticaster.addEditorMouseListener(new MyEditorMouseListener(myTooltipController), this);
EditorTrackerListener editorTrackerListener = new EditorTrackerListener() {
platform/platform-resources/src/componentSets/Lang.xml
+1 -1
View File
@@ -109,7 +109,7 @@
<interface-class>com.intellij.codeInsight.daemon.DaemonCodeAnalyzer</interface-class>
<implementation-class>com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl</implementation-class>
<option name="workspace" value="true"/>
<!--<loadForDefaultProject/>-->
<loadForDefaultProject/>
</component>
<component>
<implementation-class>com.intellij.codeInsight.daemon.impl.DaemonListeners</implementation-class>