From 1fcde4aad5f7742a44b50a023db599e79e167967 Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Mon, 4 Mar 2019 17:28:13 +0200 Subject: [PATCH] IDEA-207961 move "Copy TBX URL action" to lang-impl "com.intellij.navigation" package --- .../intellij/ide/actions/CopyTBXReferenceAction.kt | 12 ++++++------ .../impl => navigation}/JBProtocolNavigateCommand.kt | 5 ++--- .../src/META-INF/PlatformExtensions.xml | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) rename platform/lang-impl/src/com/intellij/{openapi/project/impl => navigation}/JBProtocolNavigateCommand.kt (97%) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CopyTBXReferenceAction.kt b/platform/lang-impl/src/com/intellij/ide/actions/CopyTBXReferenceAction.kt index 7dffe05e0c51..46a6b05e68fb 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CopyTBXReferenceAction.kt +++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyTBXReferenceAction.kt @@ -3,6 +3,12 @@ package com.intellij.ide.actions import com.intellij.ide.IdeBundle import com.intellij.ide.actions.CopyReferenceUtil.* +import com.intellij.navigation.JBProtocolNavigateCommand.Companion.FQN_KEY +import com.intellij.navigation.JBProtocolNavigateCommand.Companion.NAVIGATE_COMMAND +import com.intellij.navigation.JBProtocolNavigateCommand.Companion.PATH_KEY +import com.intellij.navigation.JBProtocolNavigateCommand.Companion.PROJECT_NAME_KEY +import com.intellij.navigation.JBProtocolNavigateCommand.Companion.REFERENCE_TARGET +import com.intellij.navigation.JBProtocolNavigateCommand.Companion.SELECTION import com.intellij.openapi.actionSystem.ActionPlaces import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.CommonDataKeys @@ -15,12 +21,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.ide.CopyPasteManager import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.project.Project -import com.intellij.openapi.project.impl.JBProtocolNavigateCommand.Companion.FQN_KEY -import com.intellij.openapi.project.impl.JBProtocolNavigateCommand.Companion.NAVIGATE_COMMAND -import com.intellij.openapi.project.impl.JBProtocolNavigateCommand.Companion.PATH_KEY -import com.intellij.openapi.project.impl.JBProtocolNavigateCommand.Companion.PROJECT_NAME_KEY -import com.intellij.openapi.project.impl.JBProtocolNavigateCommand.Companion.REFERENCE_TARGET -import com.intellij.openapi.project.impl.JBProtocolNavigateCommand.Companion.SELECTION import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement diff --git a/platform/lang-impl/src/com/intellij/openapi/project/impl/JBProtocolNavigateCommand.kt b/platform/lang-impl/src/com/intellij/navigation/JBProtocolNavigateCommand.kt similarity index 97% rename from platform/lang-impl/src/com/intellij/openapi/project/impl/JBProtocolNavigateCommand.kt rename to platform/lang-impl/src/com/intellij/navigation/JBProtocolNavigateCommand.kt index 57721ae64228..5e5a373030cc 100644 --- a/platform/lang-impl/src/com/intellij/openapi/project/impl/JBProtocolNavigateCommand.kt +++ b/platform/lang-impl/src/com/intellij/navigation/JBProtocolNavigateCommand.kt @@ -1,5 +1,5 @@ // 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.openapi.project.impl +package com.intellij.navigation import com.intellij.ide.RecentProjectsManager import com.intellij.ide.RecentProjectsManagerBase @@ -8,7 +8,6 @@ import com.intellij.ide.util.gotoByName.ChooseByNameModel import com.intellij.ide.util.gotoByName.ChooseByNameViewModel import com.intellij.ide.util.gotoByName.DefaultChooseByNameItemProvider import com.intellij.ide.util.gotoByName.GotoSymbolModel2 -import com.intellij.navigation.NavigationItem import com.intellij.openapi.application.JBProtocolCommand import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.editor.LogicalPosition @@ -29,7 +28,7 @@ class JBProtocolNavigateCommand : JBProtocolCommand(NAVIGATE_COMMAND) { // handles URLs of the following types: // jetbrains://idea/navigate/reference?project=IDEA - // [&reference[X]=com.intellij.openapi.project.impl.JBProtocolNavigateCommand[.perform][#perform]]+ + // [&reference[X]=com.intellij.navigation.JBProtocolNavigateCommand[.perform][#perform]]+ // [&path[X]=com/intellij/openapi/project/impl/JBProtocolNavigateCommand.kt[:23[:1]]]+ // [&selection[X]=25:5-26:6]+ diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index edd3817b8cb4..a3388c9cfaca 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -530,7 +530,7 @@ - + com.intellij.openapi.editor.actions.FlipCommaIntention