From 145f162042680f8ceff579e93a85a10a098a280c Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Tue, 18 Nov 2025 16:59:18 +0100 Subject: [PATCH] Revert "[completion] IJPL-206829 add very explicit diagnostics. to be reverted" This reverts commit 6272cd0ce3a736921931604acab002f4617102b2. GitOrigin-RevId: f6f0d41c64f7b5f5b06572348f03e1e92ba90e4e --- .../codeInsight/completion/CompletionData.java | 15 ++------------- .../completion/CompletionInitializationUtil.java | 3 --- .../intellij/psi/impl/PsiDocumentManagerBase.java | 7 ++----- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java index 64527319a26a..f9bd919ec5ac 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java @@ -1,4 +1,4 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.completion; @@ -18,7 +18,6 @@ import com.intellij.patterns.ObjectPattern; import com.intellij.psi.*; import com.intellij.psi.filters.ElementFilter; import com.intellij.psi.filters.TrueFilter; -import com.intellij.psi.impl.PsiDocumentManagerBase; import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.util.PsiUtilCore; @@ -134,17 +133,7 @@ public class CompletionData { final Document document = insertedElement.getContainingFile().getViewProvider().getDocument(); assert document != null; - - PsiDocumentManager documentManager = PsiDocumentManager.getInstance(insertedElement.getProject()); - if (documentManager.isUncommited(document)) { - Throwable throwable = null; - if (documentManager instanceof PsiDocumentManagerBase base) { - Map traces = base.getUncommitedDocumentsWithTraces(); - throwable = traces.get(document); - } - - LOG.error("Uncommitted document", throwable); - } + LOG.assertTrue(!PsiDocumentManager.getInstance(insertedElement.getProject()).isUncommited(document), "Uncommitted"); final String prefix = CompletionUtil.findReferencePrefix(insertedElement, offsetInFile); if (prefix != null) return prefix; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionInitializationUtil.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionInitializationUtil.java index 7386f0e67318..e2f775ad2085 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionInitializationUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionInitializationUtil.java @@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.psi.impl.PsiDocumentManagerBase; import com.intellij.psi.impl.PsiFileEx; import com.intellij.psi.PsiConsistencyAssertions; import com.intellij.psi.impl.source.PsiFileImpl; @@ -276,8 +275,6 @@ public final class CompletionInitializationUtil { } CompletionAssertions.assertCorrectOriginalFile("New", file, copy); - copy.getFileDocument().putUserData(PsiDocumentManagerBase.FORCE_LOG_STACK_TRACE, "please find who does not commit document"); - if (CodeInsightContexts.isSharedSourceSupportEnabled(file.getProject())) { CodeInsightContextManagerImpl codeInsightContextManager = (CodeInsightContextManagerImpl)CodeInsightContextManager.getInstance(file.getProject()); diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java index 81982b5227b1..e2c0b8a6d6be 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java +++ b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java @@ -51,6 +51,7 @@ import com.intellij.util.concurrency.ThreadingAssertions; import com.intellij.util.concurrency.annotations.RequiresEdt; import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.ui.EdtInvocationManager; import org.jetbrains.annotations.*; import java.util.*; @@ -63,10 +64,6 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen private static final Logger LOG = Logger.getInstance(PsiDocumentManagerBase.class); private static final Key HARD_REF_TO_DOCUMENT = Key.create("HARD_REFERENCE_TO_DOCUMENT"); - //todo to be removed after investigation - @ApiStatus.Internal - public static final Key FORCE_LOG_STACK_TRACE = Key.create("FORCE_LOG_STACK_TRACE"); - private boolean isInsideCommitHandler; //accessed from EDT only private final Map>> documentCommitActions = CollectionFactory.createConcurrentWeakMap(); @@ -1077,7 +1074,7 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen if (commitNecessary) { assert !(document instanceof DocumentWindow); myUncommittedDocuments.add(document); - if (Registry.is("ide.activity.tracking.enable.debug") || document.getUserData(FORCE_LOG_STACK_TRACE) != null) { + if (Registry.is("ide.activity.tracking.enable.debug")) { myUncommittedDocumentTraces.put(document, new Throwable()); } if (forceCommit) {