From cb547c0f7b7e6de97a83251afd12e7eca5a66303 Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Fri, 25 May 2018 18:37:08 +0300 Subject: [PATCH] workaround for EA-120832 - assert: FileManagerImpl.evaluateValidity --- .../com/intellij/debugger/SourcePosition.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java index 2bf52d1f08b2..2c90048a634c 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java +++ b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.debugger; import com.intellij.openapi.application.ApplicationManager; @@ -72,7 +58,7 @@ public abstract class SourcePosition implements Navigatable{ @Override @NotNull public PsiFile getFile() { - PsiFile file = myFilePointer != null ? myFilePointer.getElement() : null; + PsiFile file = myFilePointer != null ? ReadAction.compute(myFilePointer::getElement) : null; return file != null ? file : myFile; // in case of full invalidation, rollback to the original psiFile }