mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
do not export intellij.database.connectivity.tests
GitOrigin-RevId: a1ef44dfa34cde110c9e6cad19d11b5e3019ab72
This commit is contained in:
committed by
intellij-monorepo-bot
parent
c698acb233
commit
7b9ec58009
@@ -9,6 +9,7 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis.impl" />
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.images" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.copyright" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.xml.psi.impl" />
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.java.psi" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.uast" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.uast.ide" exported="" />
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -35,6 +35,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
|
||||
<orderEntry type="library" name="ASM" level="project" />
|
||||
<orderEntry type="library" name="StreamEx" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.java.psi" />
|
||||
<orderEntry type="module" module-name="intellij.platform.indexing" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.java.indexing" exported="" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
<orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
|
||||
<orderEntry type="library" name="ASM" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="StreamEx" level="project" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.builtInServer" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
|
||||
<orderEntry type="library" name="http-client" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="netty-buffer" level="project" />
|
||||
<orderEntry type="library" name="netty-codec-http" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
|
||||
+2
-2
@@ -28,8 +28,8 @@ class JupyterCorePluginListener : DynamicPluginListener {
|
||||
}
|
||||
|
||||
companion object {
|
||||
val filesToRestore = mutableListOf<Pair<Project, VirtualFile>>()
|
||||
val filesToRestore: MutableList<Pair<Project, VirtualFile>> = mutableListOf<Pair<Project, VirtualFile>>()
|
||||
|
||||
const val JUPYTER_PLUGIN_ID = "intellij.jupyter"
|
||||
const val JUPYTER_PLUGIN_ID: String = "intellij.jupyter"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="module" module-name="intellij.java.psi" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.java.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.uast.ide" exported="" />
|
||||
</component>
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.uast" />
|
||||
<orderEntry type="module" module-name="intellij.jvm.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -24,6 +24,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.workspace.storage" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
</component>
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="RUNTIME" />
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="netty-codec-http" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
|
||||
@@ -14,7 +14,14 @@ import java.nio.file.Path
|
||||
import kotlin.io.path.invariantSeparatorsPathString
|
||||
import kotlin.io.path.isDirectory
|
||||
|
||||
class PathInfo(val ioFile: Path?, file: VirtualFile?, val root: VirtualFile, moduleName: String? = null, val isLibrary: Boolean = false, val isRootNameOptionalInPath: Boolean = false) {
|
||||
class PathInfo(
|
||||
val ioFile: Path?,
|
||||
file: VirtualFile?,
|
||||
val root: VirtualFile,
|
||||
moduleName: String? = null,
|
||||
val isLibrary: Boolean = false,
|
||||
val isRootNameOptionalInPath: Boolean = false,
|
||||
) {
|
||||
var file: VirtualFile? = file
|
||||
private set
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.extensions" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.progress" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
<orderEntry type="library" name="Guava" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.diff" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diagnostic" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
|
||||
<orderEntry type="library" name="opentelemetry" level="project" />
|
||||
<orderEntry type="library" name="opentelemetry-semconv" level="project" />
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.remote.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
|
||||
+1
@@ -39,6 +39,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
|
||||
<orderEntry type="library" name="opentelemetry" level="project" />
|
||||
<orderEntry type="library" name="opentelemetry-semconv" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-protobuf" level="project" />
|
||||
|
||||
@@ -447,7 +447,7 @@ c:com.intellij.diff.util.LineCol
|
||||
- s:toOffset(com.intellij.openapi.editor.Document,I,I):I
|
||||
- s:toOffset(com.intellij.openapi.editor.Document,com.intellij.diff.util.LineCol):I
|
||||
- toOffset(com.intellij.openapi.editor.Editor):I
|
||||
c:com.intellij.diff.util.LineRange
|
||||
f:com.intellij.diff.util.LineRange
|
||||
- f:end:I
|
||||
- f:start:I
|
||||
- <init>(I,I):V
|
||||
|
||||
@@ -9,10 +9,11 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.diff" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
|
||||
@@ -1,23 +1,9 @@
|
||||
/*
|
||||
* Copyright 2000-2015 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-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.diff.util;
|
||||
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
|
||||
public class LineRange {
|
||||
public final class LineRange {
|
||||
private static final Logger LOG = Logger.getInstance(LineRange.class);
|
||||
|
||||
public final int start;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.coroutines" />
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
|
||||
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
import kotlin.time.Duration.Companion.milliseconds
|
||||
|
||||
|
||||
@ApiStatus.Internal
|
||||
class MergingUpdateQueueActivityTracker : ActivityTracker {
|
||||
override val presentableName: String
|
||||
@@ -28,10 +27,8 @@ class MergingUpdateQueueActivityTracker : ActivityTracker {
|
||||
}
|
||||
}
|
||||
|
||||
@ApiStatus.Internal
|
||||
class MergingUpdateQueueTrackerImpl : MergingUpdateQueueTracker {
|
||||
|
||||
internal val counter = AtomicInteger(0)
|
||||
private class MergingUpdateQueueTrackerImpl : MergingUpdateQueueTracker {
|
||||
@JvmField val counter = AtomicInteger(0)
|
||||
|
||||
override fun registerEnter() {
|
||||
counter.incrementAndGet()
|
||||
@@ -40,5 +37,4 @@ class MergingUpdateQueueTrackerImpl : MergingUpdateQueueTracker {
|
||||
override fun registerExit() {
|
||||
counter.decrementAndGet()
|
||||
}
|
||||
|
||||
}
|
||||
@@ -31,7 +31,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
@@ -45,6 +45,7 @@
|
||||
<orderEntry type="library" name="kotlinx-serialization-json" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diagnostic" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.settings" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.coroutines" />
|
||||
</component>
|
||||
|
||||
@@ -31,6 +31,8 @@
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.settings" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="library" scope="TEST" name="kotlin-test-assertions-core-jvm" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="opentelemetry" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.nio.fs" />
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="kotlin-test-assertions-core-jvm" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.coroutines" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel" exported="" />
|
||||
</component>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="library" exported="" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="fleet.util.logging.api" />
|
||||
<orderEntry type="module" module-name="fleet.rpc" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -41,6 +41,7 @@
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.coroutines" />
|
||||
</component>
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.classLoader" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
<orderEntry type="module" module-name="intellij.platform.codeStyle" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
|
||||
<orderEntry type="library" name="jna" level="project" />
|
||||
<orderEntry type="library" name="lz4-java" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
|
||||
<orderEntry type="module" module-name="intellij.platform.execution.impl" />
|
||||
<orderEntry type="library" name="jackson" level="project" />
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="jetbrains-annotations" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -269,18 +269,17 @@ c:com.intellij.ide.macro.ModuleSdkPathMacro
|
||||
- expand(com.intellij.openapi.actionSystem.DataContext):java.lang.String
|
||||
- getDescription():java.lang.String
|
||||
- getName():java.lang.String
|
||||
c:com.intellij.ide.macro.OsNameMacro
|
||||
f:com.intellij.ide.macro.OsNameMacro
|
||||
- com.intellij.ide.macro.Macro
|
||||
- <init>():V
|
||||
- expand(com.intellij.openapi.actionSystem.DataContext):java.lang.String
|
||||
- getDescription():java.lang.String
|
||||
- getName():java.lang.String
|
||||
c:com.intellij.ide.macro.PasswordMacro
|
||||
f:com.intellij.ide.macro.PasswordMacro
|
||||
- com.intellij.ide.macro.PromptingMacro
|
||||
- <init>():V
|
||||
- getDescription():java.lang.String
|
||||
- getName():java.lang.String
|
||||
- p:promptUser(com.intellij.openapi.actionSystem.DataContext,java.lang.String,java.lang.String):java.lang.String
|
||||
com.intellij.ide.macro.PathListMacro
|
||||
com.intellij.ide.macro.PathMacro
|
||||
f:com.intellij.ide.macro.ProjectFileDirMacro
|
||||
@@ -333,10 +332,9 @@ c:com.intellij.ide.macro.SelectionEndLineMacro
|
||||
- <init>():V
|
||||
- p:expand(com.intellij.openapi.editor.Editor):java.lang.String
|
||||
- getDescription():java.lang.String
|
||||
c:com.intellij.ide.macro.SelectionStartColumnMacro
|
||||
f:com.intellij.ide.macro.SelectionStartColumnMacro
|
||||
- com.intellij.ide.macro.EditorMacro
|
||||
- <init>():V
|
||||
- p:expand(com.intellij.openapi.editor.Editor):java.lang.String
|
||||
- getDescription():java.lang.String
|
||||
c:com.intellij.ide.macro.SelectionStartLineMacro
|
||||
- com.intellij.ide.macro.EditorMacro
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
|
||||
@@ -5,11 +5,10 @@ import com.intellij.ide.IdeCoreBundle;
|
||||
import com.intellij.openapi.actionSystem.DataContext;
|
||||
import com.intellij.openapi.util.SystemInfoRt;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public class OsNameMacro extends Macro {
|
||||
public final class OsNameMacro extends Macro {
|
||||
@Override
|
||||
public @NotNull String getName() {
|
||||
return "OSName";
|
||||
@@ -21,7 +20,7 @@ import java.util.Locale;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable String expand(@NotNull DataContext dataContext) {
|
||||
public @NotNull String expand(@NotNull DataContext dataContext) {
|
||||
String osName = SystemInfoRt.OS_NAME.toLowerCase(Locale.ENGLISH);
|
||||
int firstSpace = osName.indexOf(' ');
|
||||
return firstSpace < 0 ? osName : osName.substring(0, firstSpace);
|
||||
|
||||
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class PasswordMacro extends PromptingMacro{
|
||||
public final class PasswordMacro extends PromptingMacro{
|
||||
@Override
|
||||
public @NotNull String getName() {
|
||||
return "Password";
|
||||
|
||||
@@ -5,8 +5,7 @@ import com.intellij.execution.ExecutionBundle;
|
||||
import com.intellij.openapi.editor.Editor;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
|
||||
public class SelectionStartColumnMacro extends EditorMacro {
|
||||
public final class SelectionStartColumnMacro extends EditorMacro {
|
||||
public SelectionStartColumnMacro() {
|
||||
super("SelectionStartColumn");
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" exported="" name="jetbrains.mlapi.extension" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -35,6 +35,8 @@
|
||||
<orderEntry type="library" name="jetbrains-annotations" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="library" name="jna" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-json" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -7,8 +7,10 @@ import java.awt.Dimension
|
||||
import java.awt.Insets
|
||||
import javax.swing.JComponent
|
||||
|
||||
val Insets.width: Int get() = left + right
|
||||
val Insets.height: Int get() = top + bottom
|
||||
val Insets.width: Int
|
||||
get() = left + right
|
||||
val Insets.height: Int
|
||||
get() = top + bottom
|
||||
|
||||
var JBPopup.width: Int
|
||||
get() = size.width
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" exported="" />
|
||||
<orderEntry type="library" name="pty4j" level="project" />
|
||||
<orderEntry type="library" name="winp" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="proxy-vole" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="rhino" level="project" />
|
||||
<orderEntry type="library" name="jna" level="project" />
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="library" name="Guava" level="project" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.base" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="jna" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diagnostic" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel" />
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="library" name="Guava" level="project" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
<orderEntry type="library" name="netty-buffer" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="netty-codec-http" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.progress" />
|
||||
<orderEntry type="module" module-name="intellij.platform.kernel" />
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.progress" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
|
||||
<orderEntry type="module" module-name="intellij.platform.kernel" />
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-json" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.kernel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
@JvmField
|
||||
@ApiStatus.Internal
|
||||
val PROJECT_ID = Key.create<ProjectId>("ProjectImpl.PROJECT_ID")
|
||||
val PROJECT_ID: Key<ProjectId> = Key.create<ProjectId>("ProjectImpl.PROJECT_ID")
|
||||
|
||||
/**
|
||||
* Represents a unique identifier for a [Project].
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.jps.model.serialization" exported="" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="kotlin-reflect" level="project" />
|
||||
|
||||
@@ -6,5 +6,6 @@ import com.intellij.openapi.projectRoots.Sdk
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
@ApiStatus.Internal
|
||||
fun Sdk.isBasedOnCredentialsType(credentialsType: CredentialsType<*>): Boolean =
|
||||
(sdkAdditionalData as? RemoteSdkAdditionalData)?.remoteConnectionType == credentialsType
|
||||
fun Sdk.isBasedOnCredentialsType(credentialsType: CredentialsType<*>): Boolean {
|
||||
return (sdkAdditionalData as? RemoteSdkAdditionalData)?.remoteConnectionType == credentialsType
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="opentelemetry" level="project" />
|
||||
<orderEntry type="library" name="opentelemetry-semconv" level="project" />
|
||||
<orderEntry type="library" name="commons-lang3" level="project" />
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
<orderEntry type="module" module-name="intellij.platform.execution" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
</component>
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
|
||||
|
||||
@@ -90,6 +90,7 @@
|
||||
<orderEntry type="library" scope="TEST" name="jackson-dataformat-yaml" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.xmlDom" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.objectSerializer" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-json" level="project" />
|
||||
<orderEntry type="library" name="aalto-xml" level="project" />
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="library" name="jetbrains-annotations" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.extensions" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-core" level="project" />
|
||||
<orderEntry type="library" name="kotlinx-serialization-json" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.concurrency" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
<orderEntry type="library" name="jna" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="library" exported="" name="ap-validation" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.runtime.product" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" name="jetbrains-annotations" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel.impl" />
|
||||
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diff" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
</component>
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.vcs.log.graph" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.vcs.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.vcs" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.diff" />
|
||||
</component>
|
||||
|
||||
@@ -8,7 +8,6 @@ import com.intellij.openapi.vcs.FilePath
|
||||
import com.intellij.openapi.vcs.VcsException
|
||||
import com.intellij.openapi.vcs.VcsKey
|
||||
import com.intellij.openapi.vcs.history.VcsFileRevision
|
||||
import com.intellij.openapi.vcs.history.VcsFileRevisionEx
|
||||
import com.intellij.openapi.vfs.VirtualFile
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.java.analysis" />
|
||||
</component>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.dev.codeInsight" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis.impl" />
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.vcs.core" scope="PROVIDED" />
|
||||
<orderEntry type="module" module-name="intellij.platform.vcs.log" scope="PROVIDED" />
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.images" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.devkit.core" />
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="kotlinc.kotlin-compiler-common" level="project" />
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.devkit.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
|
||||
+2
-2
@@ -10,10 +10,10 @@ import org.jetbrains.annotations.Nullable;
|
||||
import ru.adelf.idea.dotenv.api.EnvironmentVariablesApi;
|
||||
import ru.adelf.idea.dotenv.util.EnvironmentVariablesUtil;
|
||||
|
||||
public class DockerfileKeyGotoHandler implements GotoDeclarationHandler {
|
||||
final class DockerfileKeyGotoHandler implements GotoDeclarationHandler {
|
||||
|
||||
@Override
|
||||
public @Nullable PsiElement[] getGotoDeclarationTargets(@Nullable PsiElement psiElement, int i, Editor editor) {
|
||||
public PsiElement @Nullable [] getGotoDeclarationTargets(@Nullable PsiElement psiElement, int i, Editor editor) {
|
||||
if (psiElement == null || psiElement.getParent() == null) {
|
||||
return PsiElement.EMPTY_ARRAY;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="module" module-name="intellij.dotenv" />
|
||||
<orderEntry type="module" module-name="intellij.java.psi" />
|
||||
<orderEntry type="module" module-name="intellij.java.frontback.psi.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import ru.adelf.idea.dotenv.models.KeyUsagePsiElement;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
|
||||
class JavaEnvironmentCallsVisitor extends JavaRecursiveElementWalkingVisitor {
|
||||
final class JavaEnvironmentCallsVisitor extends JavaRecursiveElementWalkingVisitor {
|
||||
private final Collection<KeyUsagePsiElement> collectedItems = new HashSet<>();
|
||||
|
||||
@Override
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.dotenv" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.dotenv.java" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ import ru.adelf.idea.dotenv.models.KeyUsagePsiElement;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
class KotlinEnvironmentCallsVisitor extends KtTreeVisitor<Set<KeyUsagePsiElement>> {
|
||||
final class KotlinEnvironmentCallsVisitor extends KtTreeVisitor<Set<KeyUsagePsiElement>> {
|
||||
@Override
|
||||
public Void visitCallExpression(@NotNull KtCallExpression expression, Set<KeyUsagePsiElement> data) {
|
||||
KeyUsagePsiElement keyUsage = KotlinPsiHelper.getKeyUsageFromCall(expression);
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.python.psi" />
|
||||
<orderEntry type="module" module-name="intellij.dotenv" />
|
||||
<orderEntry type="module" module-name="intellij.platform.editor" />
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@ import ru.adelf.idea.dotenv.DotEnvSettings;
|
||||
import ru.adelf.idea.dotenv.api.EnvironmentVariablesApi;
|
||||
import ru.adelf.idea.dotenv.common.BaseEnvCompletionProvider;
|
||||
|
||||
public class PythonEnvCompletionProvider extends BaseEnvCompletionProvider implements GotoDeclarationHandler {
|
||||
public PythonEnvCompletionProvider() {
|
||||
final class PythonEnvCompletionProvider extends BaseEnvCompletionProvider implements GotoDeclarationHandler {
|
||||
PythonEnvCompletionProvider() {
|
||||
extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<CompletionParameters>() {
|
||||
@Override
|
||||
protected void addCompletions(@NotNull CompletionParameters completionParameters, @NotNull ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) {
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import ru.adelf.idea.dotenv.models.KeyUsagePsiElement;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
public class PythonEnvironmentVariablesUsagesProvider implements EnvironmentVariablesUsagesProvider {
|
||||
final class PythonEnvironmentVariablesUsagesProvider implements EnvironmentVariablesUsagesProvider {
|
||||
@Override
|
||||
public boolean acceptFile(VirtualFile file) {
|
||||
return file.getFileType().equals(PythonFileType.INSTANCE);
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import ru.adelf.idea.dotenv.models.KeyUsagePsiElement;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
public class RubyEnvironmentVariablesUsagesProvider implements EnvironmentVariablesUsagesProvider {
|
||||
final class RubyEnvironmentVariablesUsagesProvider implements EnvironmentVariablesUsagesProvider {
|
||||
@Override
|
||||
public boolean acceptFile(VirtualFile file) {
|
||||
return file.getFileType().equals(RubyFileType.RUBY);
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.statistics" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.sqlite" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
|
||||
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
|
||||
</component>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
|
||||
@Service
|
||||
class AEDatabaseLifetime(private val coroutineScope: CoroutineScope) : Disposable {
|
||||
internal class AEDatabaseLifetime(private val coroutineScope: CoroutineScope) : Disposable {
|
||||
companion object {
|
||||
fun getScope() = ApplicationManager.getApplication().service<AEDatabaseLifetime>().coroutineScope
|
||||
fun getDisposable(): Disposable = ApplicationManager.getApplication().service<AEDatabaseLifetime>()
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="module" module-name="intellij.vcs.github" />
|
||||
<orderEntry type="module" module-name="intellij.json" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.analysis" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -13,6 +13,7 @@
|
||||
<orderEntry type="module" module-name="intellij.gradle.java" />
|
||||
<orderEntry type="module" module-name="intellij.java.psi" />
|
||||
<orderEntry type="module" module-name="intellij.java.psi.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
</component>
|
||||
</module>
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2022 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 org.jetbrains.plugins.gradle.service.resolve.static
|
||||
|
||||
import com.android.tools.idea.gradle.dsl.api.ProjectBuildModel
|
||||
@@ -11,7 +11,7 @@ import com.intellij.psi.PsiClass
|
||||
import com.intellij.psi.PsiElement
|
||||
import org.jetbrains.plugins.gradle.service.resolve.GradleVersionCatalogHandler
|
||||
|
||||
class GradleDslVersionCatalogHandler : GradleVersionCatalogHandler {
|
||||
private class GradleDslVersionCatalogHandler : GradleVersionCatalogHandler {
|
||||
@Deprecated("Doesn't work for included builds of a composite build", replaceWith = ReplaceWith("getVersionCatalogFiles(module)"))
|
||||
override fun getExternallyHandledExtension(project: Project): Set<String> {
|
||||
// todo
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2023 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 org.jetbrains.plugins.gradle.service.resolve.static
|
||||
|
||||
import com.android.tools.idea.gradle.dsl.api.GradleVersionCatalogModel
|
||||
@@ -18,7 +18,7 @@ import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames
|
||||
/**
|
||||
* Serves as a client for PSI infrastructure and as a layer over TOML version catalog files at the same time
|
||||
*/
|
||||
class SyntheticVersionCatalogAccessor(
|
||||
internal class SyntheticVersionCatalogAccessor(
|
||||
project: Project,
|
||||
scope: GlobalSearchScope,
|
||||
model: GradleVersionCatalogModel,
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="module" module-name="intellij.grazie.core" />
|
||||
<orderEntry type="module" module-name="intellij.markdown" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
</component>
|
||||
</module>
|
||||
+1
-1
@@ -11,7 +11,7 @@ import org.intellij.plugins.markdown.lang.MarkdownElementTypes
|
||||
import org.intellij.plugins.markdown.lang.MarkdownTokenTypes
|
||||
|
||||
@Suppress("MemberVisibilityCanBePrivate")
|
||||
object MarkdownPsiUtils {
|
||||
internal object MarkdownPsiUtils {
|
||||
internal fun ASTNode.isMarkdownLinkType() = when (elementType) {
|
||||
MarkdownElementTypes.LINK_DEFINITION,
|
||||
MarkdownElementTypes.LINK_LABEL,
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<orderEntry type="module" module-name="intellij.grazie.core" />
|
||||
<orderEntry type="module" module-name="intellij.properties" />
|
||||
<orderEntry type="module" module-name="intellij.properties.psi" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util.ex" />
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
|
||||
|
||||
import static com.intellij.grazie.text.TextContent.TextDomain.COMMENTS;
|
||||
|
||||
public class PropertyTextExtractor extends TextExtractor {
|
||||
final class PropertyTextExtractor extends TextExtractor {
|
||||
private static final Pattern apostrophes = Pattern.compile("'(?=')");
|
||||
private static final Pattern continuationIndent = Pattern.compile("(?<=\n)[ \t]+");
|
||||
private static final Pattern trailingSlash = Pattern.compile("\\\\\n");
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<orderEntry type="library" name="kotlin-stdlib" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.grazie.core" />
|
||||
<orderEntry type="module" module-name="intellij.yaml" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.yaml.editing" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="intellij.groovy" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.vcs.git" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.ide.core" />
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2000-2023 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.groovy.git
|
||||
|
||||
import git4idea.checkin.ConvertLanguageExplicitMovementProvider
|
||||
import org.jetbrains.plugins.groovy.refactoring.convertToJava.git.pathBeforeGroovyToJavaConversion
|
||||
|
||||
class GroovyExplicitMovementProvider : ConvertLanguageExplicitMovementProvider("groovy", "java", pathBeforeGroovyToJavaConversion)
|
||||
private class GroovyExplicitMovementProvider : ConvertLanguageExplicitMovementProvider("groovy", "java", pathBeforeGroovyToJavaConversion)
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
<orderEntry type="module" module-name="kotlin.base.analysis" />
|
||||
<orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
|
||||
<orderEntry type="module" module-name="kotlin.base.util" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="kotlin.base.indices" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.indexing" />
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
<orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
|
||||
<orderEntry type="module" module-name="kotlin.base.indices" />
|
||||
<orderEntry type="module" module-name="intellij.platform.indexing" />
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.java.indexing.impl" />
|
||||
<orderEntry type="module" module-name="kotlin.base.psi" />
|
||||
<orderEntry type="module" module-name="kotlin.base.analysis" />
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user