Skip to content

Commit

Permalink
Merge branch 'release/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
nils-a committed Aug 20, 2021
2 parents 7f3b2df + c269bb8 commit 11c08b8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/rider/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ plugins {
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
id("org.jetbrains.changelog") version "1.2.1"
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html
id("io.gitlab.arturbosch.detekt") version "1.17.1"
id("io.gitlab.arturbosch.detekt") version "1.18.0"
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
// grammarkit to generate parser & lexer (i.e. the bnf and the flex file...)
Expand All @@ -53,7 +53,7 @@ repositories {
jcenter()
}
dependencies {
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.18.0")

testImplementation("org.junit.jupiter:junit-jupiter:5.7.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package net.cakebuild.actions

import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.fileTypes.FileType
import com.intellij.openapi.fileTypes.FileTypes
Expand Down Expand Up @@ -36,8 +37,11 @@ abstract class InstallFileToProjectAction : AnAction(), DumbAware {
return
}

log.trace("deleting $fileName, before downloading it new.")
existing.delete(this)
val app = ApplicationManager.getApplication()
app.runWriteAction {
log.trace("deleting $fileName, before downloading it new.")
existing.delete(this)
}
}
val settings = CakeSettings.getInstance(e.project!!)
val service = DownloadableFileService.getInstance()
Expand Down

0 comments on commit 11c08b8

Please sign in to comment.