From 2d82946c5fe2bf1140290a3b4f42b26410ebff81 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 24 Sep 2019 07:44:42 +0200 Subject: [PATCH] executeNonCancelableSection not required to get JspSpiUtil anymore because it is performed by platform GitOrigin-RevId: 958409740b65509d5902d74e37f7768e07827302 --- java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java b/java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java index 559e1e9b0194..ca8ec95f177e 100644 --- a/java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java +++ b/java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java @@ -1,13 +1,11 @@ // Copyright 2000-2019 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.psi.jsp; -import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; -import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.OrderEnumerator; -import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -40,9 +38,7 @@ public abstract class JspSpiUtil { @Nullable private static JspSpiUtil getJspSpiUtil() { - Ref result = Ref.create(); - ProgressManager.getInstance().executeNonCancelableSection(() -> result.set(ServiceManager.getService(JspSpiUtil.class))); - return result.get(); + return ApplicationManager.getApplication().getService(JspSpiUtil.class); } public static int escapeCharsInJspContext(JspFile file, int offset, String toEscape) throws IncorrectOperationException {