Check for plugin update before allowing to submit exception
This commit is contained in:
@@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.reporter;
|
|
||||||
|
|
||||||
import com.intellij.diagnostic.ITNReporter;
|
|
||||||
import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* We need to wrap ITNReporter for force showing or errors from kotlin plugin even from released version of IDEA.
|
|
||||||
*/
|
|
||||||
public class KotlinReportSubmitter extends ITNReporter {
|
|
||||||
@Override
|
|
||||||
public boolean showErrorInRelease(IdeaLoggingEvent event) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea.reporter
|
||||||
|
|
||||||
|
import com.intellij.diagnostic.ITNReporter
|
||||||
|
import com.intellij.openapi.diagnostic.IdeaLoggingEvent
|
||||||
|
import com.intellij.openapi.diagnostic.SubmittedReportInfo
|
||||||
|
import com.intellij.openapi.ui.Messages
|
||||||
|
import com.intellij.util.Consumer
|
||||||
|
import org.jetbrains.kotlin.idea.KotlinPluginUpdater
|
||||||
|
import org.jetbrains.kotlin.idea.KotlinPluginUtil
|
||||||
|
import org.jetbrains.kotlin.idea.PluginUpdateStatus
|
||||||
|
import java.awt.Component
|
||||||
|
|
||||||
|
/**
|
||||||
|
* We need to wrap ITNReporter for force showing or errors from kotlin plugin even from released version of IDEA.
|
||||||
|
*/
|
||||||
|
class KotlinReportSubmitter : ITNReporter() {
|
||||||
|
private var hasUpdate = false
|
||||||
|
private var hasLatestVersion = false
|
||||||
|
|
||||||
|
override fun showErrorInRelease(event: IdeaLoggingEvent?) = !hasUpdate
|
||||||
|
|
||||||
|
override fun submit(events: Array<out IdeaLoggingEvent>, additionalInfo: String?, parentComponent: Component, consumer: Consumer<SubmittedReportInfo>): Boolean {
|
||||||
|
if (hasUpdate) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasLatestVersion) {
|
||||||
|
return super.submit(events, additionalInfo, parentComponent, consumer)
|
||||||
|
}
|
||||||
|
|
||||||
|
KotlinPluginUpdater.getInstance().runUpdateCheck { status ->
|
||||||
|
if (status is PluginUpdateStatus.Update) {
|
||||||
|
hasUpdate = true
|
||||||
|
val rc = Messages.showDialog(parentComponent,
|
||||||
|
"You're running Kotlin plugin version ${KotlinPluginUtil.getPluginVersion()}, " +
|
||||||
|
"while the latest version is ${status.pluginDescriptor.version}",
|
||||||
|
"Update Kotlin Plugin",
|
||||||
|
arrayOf("Update", "Ignore"),
|
||||||
|
0, Messages.getInformationIcon())
|
||||||
|
if (rc == 0) {
|
||||||
|
KotlinPluginUpdater.getInstance().installPluginUpdate(status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
hasLatestVersion = true
|
||||||
|
super.submit(events, additionalInfo, parentComponent, consumer)
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user