diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 8d0f02fe7b5f..44fee0080564 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -61,5 +61,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 95e982404989..a6767cd19cf0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -773,6 +773,7 @@
+
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index a1a6c3769c05..3a331cd2b6c5 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -140,5 +140,6 @@
+
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 4ed8d0a564bd..5b3719518c49 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -293,6 +293,11 @@ class CommunityLibraryLicenses {
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0", url: "https://github.com/FasterXML/jackson"),
new LibraryLicense(name: "Jackson Databind", libraryName: "jackson-databind", license: "Apache 2.0",
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0", url: "https://github.com/FasterXML/jackson-databind"),
+ new LibraryLicense(name: "Jackson Datatype Joda",
+ libraryName: "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.2",
+ license: "Apache 2.0",
+ licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0",
+ url: "https://github.com/FasterXML/jackson-datatype-joda"),
new LibraryLicense(name: "Jackson Module Kotlin", libraryName: "jackson-module-kotlin", license: "Apache 2.0",
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0", url: "https://github.com/FasterXML/jackson-module-kotlin"),
new LibraryLicense(name: "Jakarta ORO", libraryName: "OroMatcher", license: "Apache",
@@ -405,6 +410,16 @@ class CommunityLibraryLicenses {
new LibraryLicense(name: "Kryo", libraryName: "Kryo", license: "New BSD License",
url: "https://github.com/EsotericSoftware/kryo",
licenseUrl: "https://github.com/EsotericSoftware/kryo/blob/master/LICENSE.md"),
+ new LibraryLicense(name: "ktor-client-apache",
+ libraryName: "io.ktor:ktor-client-apache",
+ license: "Apache 2.0",
+ licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0",
+ url: "https://github.com/ktorio/ktor"),
+ new LibraryLicense(name: "ktor-websockets",
+ libraryName: "ktor-websockets",
+ license: "Apache 2.0",
+ licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0",
+ url: "https://github.com/ktorio/ktor"),
new LibraryLicense(name: "kXML2", libraryName: "kxml2", license: "BSD", url: "http://sourceforge.net/projects/kxml/"),
new LibraryLicense(name: "Layout Inspector Protos", libraryName: "layoutinspector-proto", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Log4j", libraryName: "Log4J", license: "Apache 2.0",
@@ -617,15 +632,18 @@ class CommunityLibraryLicenses {
jetbrainsLibrary("jps-build-script-dependencies-bootstrap"),
jetbrainsLibrary("kotlin-reflect"),
jetbrainsLibrary("kotlin-script-runtime"),
+ jetbrainsLibrary("kotlin-scripting-intellij"),
jetbrainsLibrary("kotlin-stdlib-jdk8"),
jetbrainsLibrary("kotlin-test"),
jetbrainsLibrary("kotlinx-coroutines-jdk8"),
+ jetbrainsLibrary("kotlinx-coroutines-slf4j"),
jetbrainsLibrary("ml-completion-prev-exprs-models"),
jetbrainsLibrary("precompiled_jshell-frontend"),
jetbrainsLibrary("rd-core"),
jetbrainsLibrary("rd-framework"),
jetbrainsLibrary("rd-swing"),
jetbrainsLibrary("rd-text"),
+ jetbrainsLibrary("space-idea-sdk"),
jetbrainsLibrary("tcServiceMessages"),
jetbrainsLibrary("tips-idea-ce"),
jetbrainsLibrary("tips-pycharm-community"),
diff --git a/plugins/space/build.gradle b/plugins/space/build.gradle
index f6a9ca4e2c23..f8f3ffa14887 100644
--- a/plugins/space/build.gradle
+++ b/plugins/space/build.gradle
@@ -1,84 +1,84 @@
-import static Versions.*
-
-buildscript {
- repositories {
- maven { url "https://www.jetbrains.com/intellij-repository/snapshots" } // for nightly builds
- if (Build.buildSettings.useCacheRedirector) {
- maven { url "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-plugin-service" }
- } else {
- maven { url "https://dl.bintray.com/jetbrains/intellij-plugin-service" }
- }
- }
-}
-
-plugins {
- id "org.jetbrains.intellij" version "0.4.18"
-}
-
-applyKotlinJVM()
-
-def pluginTitle = "space-intellij-plugin"
-
-if (hasProperty("teamcity")) {
- if (project.hasProperty('pluginChannel')) {
- version = "2020.1.internal.${teamcity["build.number"]}"
- } else {
- version = "2020.1.${teamcity["build.number"]}"
- }
-}
-
-dependencies {
- compile project(":app:app-state")
-
- compile "org.slf4j:jul-to-slf4j:$sl4j_version"
- compile "ch.qos.logback:logback-classic:1.2.1"
-
- compile "io.ktor:ktor-server-core:$ktor_version"
- compile "io.ktor:ktor-server-jetty:$ktor_version"
-
- compile project(':plugins:pipelines:pipelines-config:pipelines-config-compiler-bootstrap')
- compile project(':plugins:pipelines:pipelines-config:pipelines-config-utils')
-
- compile project(':plugins:pipelines:pipelines-config:pipelines-config-dsl-script-exec')
-
- compile project(':plugins:pipelines:pipelines-common')
- compile project(':plugins:pipelines:pipelines-engine')
- compile project(':plugins:pipelines:pipelines-utils')
- compile project(':plugins:pipelines:pipelines-provider')
- compile project(':plugins:pipelines:pipelines-provider-local')
-}
-
-test { finalizedBy jacocoTestReport }
-
-def kotlinIdeaPluginVersion = "1.3.70-release-IJ2020.1-2"
-
-intellij {
- version "201.6668.121"
- pluginName pluginTitle
- updateSinceUntilBuild false
- sandboxDirectory "${project.buildDir}/.sandbox"
- setPlugins("org.jetbrains.kotlin:$kotlinIdeaPluginVersion", 'git4idea')
- downloadSources = true
-}
-
-runIde {
- jbrVersion = '11_0_2b159'
- dependsOn ":plugins:pipelines:pipelines-config:pipelines-config-compiler:publishToMavenLocal"
- dependsOn ":plugins:pipelines:pipelines-config:pipelines-config-dsl-runtime:publishToMavenLocal"
-}
-
-publishPlugin {
- channels project.hasProperty('pluginChannel') ? project.property('pluginChannel') : ''
- token System.getenv('IDEA_PLUGIN_DEPLOY_TOKEN')
-}
-
-prepareSandbox {
-
- def defTask = project.tasks.getByPath(":plugins:pipelines:pipelines-config:pipelines-config-scriptdefinition-compile:runtimeJar")
-
- from(defTask) {
- into "${pluginTitle}/script-def"
- }
-
- dependsOn defTask
-}
+//import static Versions.*
+//
+//buildscript {
+// repositories {
+// maven { url "https://www.jetbrains.com/intellij-repository/snapshots" } // for nightly builds
+// if (Build.buildSettings.useCacheRedirector) {
+// maven { url "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-plugin-service" }
+// } else {
+// maven { url "https://dl.bintray.com/jetbrains/intellij-plugin-service" }
+// }
+// }
+//}
+//
+//plugins {
+// id "org.jetbrains.intellij" version "0.4.18"
+//}
+//
+//applyKotlinJVM()
+//
+//def pluginTitle = "space-intellij-plugin"
+//
+//if (hasProperty("teamcity")) {
+// if (project.hasProperty('pluginChannel')) {
+// version = "2020.1.internal.${teamcity["build.number"]}"
+// } else {
+// version = "2020.1.${teamcity["build.number"]}"
+// }
+//}
+//
+//dependencies {
+// compile project(":app:app-state")
+//
+// compile "org.slf4j:jul-to-slf4j:$sl4j_version"
+// compile "ch.qos.logback:logback-classic:1.2.1"
+//
+// comppile "io.ktor:ktor-server-core:$ktor_version"
+// compile "io.ktor:ktor-server-jetty:$ktor_version"
+//
+// compile project(':plugins:pipelines:pipelines-config:pipelines-config-compiler-bootstrap')
+// compile project(':plugins:pipelines:pipelines-config:pipelines-config-utils')
+//
+// compile project(':plugins:pipelines:pipelines-config:pipelines-config-dsl-script-exec')
+//
+// compile project(':plugins:pipelines:pipelines-common')
+// compile project(':plugins:pipelines:pipelines-engine')
+// compile project(':plugins:pipelines:pipelines-utils')
+// compile project(':plugins:pipelines:pipelines-provider')
+// compile project(':plugins:pipelines:pipelines-provider-local')
+//}
+//
+//test { finalizedBy jacocoTestReport }
+//
+//def kotlinIdeaPluginVersion = "1.3.70-release-IJ2020.1-2"
+//
+//intellij {
+// version "201.6668.121"
+// pluginName pluginTitle
+// updateSinceUntilBuild false
+// sandboxDirectory "${project.buildDir}/.sandbox"
+// setPlugins("org.jetbrains.kotlin:$kotlinIdeaPluginVersion", 'git4idea')
+// downloadSources = true
+//}
+//
+//runIde {
+// jbrVersion = '11_0_2b159'
+// dependsOn ":plugins:pipelines:pipelines-config:pipelines-config-compiler:publishToMavenLocal"
+// dependsOn ":plugins:pipelines:pipelines-config:pipelines-config-dsl-runtime:publishToMavenLocal"
+//}
+//
+//publishPlugin {
+// channels project.hasProperty('pluginChannel') ? project.property('pluginChannel') : ''
+// token System.getenv('IDEA_PLUGIN_DEPLOY_TOKEN')
+//}
+//
+//prepareSandbox {
+//
+// def defTask = project.tasks.getByPath(":plugins:pipelines:pipelines-config:pipelines-config-scriptdefinition-compile:runtimeJar")
+//
+// from(defTask) {
+// into "${pluginTitle}/script-def"
+// }
+//
+// dependsOn defTask
+//}
diff --git a/plugins/space/intellij.space.iml b/plugins/space/intellij.space.iml
new file mode 100644
index 000000000000..69394af83378
--- /dev/null
+++ b/plugins/space/intellij.space.iml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/space/src/main/kotlin/circlet/plugins/pipelines/services/CircletScriptDefinitionsProvider.kt b/plugins/space/src/main/kotlin/circlet/plugins/pipelines/services/CircletScriptDefinitionsProvider.kt
index 2bf172a3dfd3..d3f5c7481c0d 100644
--- a/plugins/space/src/main/kotlin/circlet/plugins/pipelines/services/CircletScriptDefinitionsProvider.kt
+++ b/plugins/space/src/main/kotlin/circlet/plugins/pipelines/services/CircletScriptDefinitionsProvider.kt
@@ -1,9 +1,9 @@
package circlet.plugins.pipelines.services
-import circlet.pipelines.config.utils.*
-import circlet.plugins.pipelines.utils.*
-import java.io.*
-import kotlin.script.experimental.intellij.*
+import circlet.pipelines.config.utils.ScriptConstants
+import circlet.plugins.pipelines.utils.JarFinder
+import java.io.File
+import kotlin.script.experimental.intellij.ScriptDefinitionsProvider
class CircletScriptDefinitionsProvider : ScriptDefinitionsProvider {
@@ -25,5 +25,4 @@ class CircletScriptDefinitionsProvider : ScriptDefinitionsProvider {
override fun useDiscovery(): Boolean {
return true
}
-
}
diff --git a/plugins/space/src/main/kotlin/circlet/vcs/CircletOpenInBrowserAction.kt b/plugins/space/src/main/kotlin/circlet/vcs/CircletOpenInBrowserAction.kt
index 926c9248ade3..02da96a4ccc7 100644
--- a/plugins/space/src/main/kotlin/circlet/vcs/CircletOpenInBrowserAction.kt
+++ b/plugins/space/src/main/kotlin/circlet/vcs/CircletOpenInBrowserAction.kt
@@ -1,24 +1,31 @@
package circlet.vcs
-import circlet.actions.*
-import circlet.client.api.*
+import circlet.actions.CircletActionUtils
import circlet.client.api.Navigator
-import circlet.components.*
-import com.intellij.dvcs.repo.*
-import com.intellij.ide.*
+import circlet.client.api.ProjectLocation
+import circlet.components.circletWorkspace
+import com.intellij.dvcs.repo.VcsRepositoryManager
+import com.intellij.ide.BrowserUtil
import com.intellij.openapi.actionSystem.*
-import com.intellij.openapi.progress.*
-import com.intellij.openapi.project.*
-import com.intellij.openapi.vcs.*
-import com.intellij.openapi.vcs.changes.*
-import com.intellij.openapi.vcs.history.*
-import com.intellij.openapi.vfs.*
-import com.intellij.vcs.log.*
-import com.intellij.vcsUtil.*
-import git4idea.*
-import git4idea.history.*
-import git4idea.repo.*
-import icons.*
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.Task
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vcs.VcsDataKeys
+import com.intellij.openapi.vcs.changes.Change
+import com.intellij.openapi.vcs.changes.ChangeListManager
+import com.intellij.openapi.vcs.history.VcsFileRevisionEx
+import com.intellij.openapi.vfs.VfsUtilCore
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.vcs.log.CommitId
+import com.intellij.vcs.log.VcsLogDataKeys
+import com.intellij.vcsUtil.VcsUtil
+import git4idea.GitRevisionNumber
+import git4idea.GitUtil
+import git4idea.history.GitHistoryUtils
+import git4idea.repo.GitRepository
+import icons.CircletIcons
import runtime.routing.Location
import com.intellij.openapi.util.Ref as Ref1
@@ -227,7 +234,7 @@ class CircletVcsOpenInBrowserActionGroup :
val hash = getCurrentFileRevisionHash(project, virtualFile) ?: return null
return Navigator.p.project(description.projectKey)
- .file(repo, hash, relativePath)
+ .fileAnnotate(repo, hash, relativePath)
.absoluteHref(server)
}
diff --git a/plugins/space/src/main/resources/META-INF/plugin.xml b/plugins/space/src/main/resources/META-INF/plugin.xml
index e69096c1d539..e2ca5fc51f0a 100644
--- a/plugins/space/src/main/resources/META-INF/plugin.xml
+++ b/plugins/space/src/main/resources/META-INF/plugin.xml
@@ -1,28 +1,13 @@
-
+
com.jetbrains.space
Space
- 0.1.dev
- JetBrains
JetBrains Space so you can view and clone project repositories.
]]>
-
-
-Share a project on Space directly from the IntelliJ-based IDE
-Configure the method of clonning HTTP/SSH. HTTP is set by default
-UI improvements
-
- ]]>
-
-
-
-
-
+ JetBrains
@@ -55,10 +40,10 @@
-
-
-
-
+