From 2050e434f9d0a30cc5383492615d48ebe0b5a4e6 Mon Sep 17 00:00:00 2001 From: irengrig Date: Sat, 29 Aug 2015 13:37:04 +0200 Subject: [PATCH 1/4] throwable pair consumer --- .../intellij/util/ThrowablePairConsumer.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 platform/util/src/com/intellij/util/ThrowablePairConsumer.java diff --git a/platform/util/src/com/intellij/util/ThrowablePairConsumer.java b/platform/util/src/com/intellij/util/ThrowablePairConsumer.java new file mode 100644 index 000000000000..01e8048867a1 --- /dev/null +++ b/platform/util/src/com/intellij/util/ThrowablePairConsumer.java @@ -0,0 +1,23 @@ +/* + * 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. + */ +package com.intellij.util; + +/** + * @author Irina.Chernushina on 8/29/2015. + */ +public interface ThrowablePairConsumer { + void consume(P p, S s) throws T; +} From 72c1f21eef74b301f7b2678eb6cdf36e5d20e92c Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 1 Sep 2015 14:48:47 +0300 Subject: [PATCH 2/4] IDEA-144524 Filtering inspections by language removes batch inspections --- .../profile/codeInspection/ui/filter/InspectionsFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionsFilter.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionsFilter.java index e80c357c1202..2e873bec81cc 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionsFilter.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionsFilter.java @@ -117,7 +117,7 @@ public abstract class InspectionsFilter { return false; } - if (myAvailableOnlyForAnalyze != isAvailableOnlyForAnalyze(tools)) { + if (myAvailableOnlyForAnalyze && !isAvailableOnlyForAnalyze(tools)) { return false; } From c26ca5668ee60855a5f5f10b4e4494c66fa7a091 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 1 Sep 2015 14:46:45 +0300 Subject: [PATCH 3/4] IDEA-144617 Wrong menu item capitalization --- .../src/messages/ExecutionBundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index cad5070ce93e..5454e5bd38f0 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -28,7 +28,7 @@ choose.run.configuration.action.description=Open run/debug configurations dropdo #action - run. debug,profile etc perform.action.with.context.configuration.action.name={0} context configuration -show.running.list.action.name=Show running list +show.running.list.action.name=Show Running List show.running.list.action.description=Show list of Run Configurations running at the moment show.running.list.balloon.title=Running List show.running.list.balloon.nothing=Nothing to show From c58489087c3418db1e942eb5a712eabc6a289fa7 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 1 Sep 2015 14:32:43 +0300 Subject: [PATCH 4/4] RUBY-17096 IDEA-132779 github: open browser links by hash --- .../plugins/github/GithubOpenInBrowserAction.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java index bb4aad8f44b9..58c958a7c4d2 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java @@ -142,17 +142,12 @@ public class GithubOpenInBrowserAction extends DumbAwareAction { String relativePath = path.substring(rootPath.length()); - String branch = getCurrentBranchNameOnRemote(repository); - if (branch != null) { - return makeUrlToOpen(editor, relativePath, branch, githubRemoteUrl); - } - String hash = getCurrentFileRevisionHash(project, virtualFile); if (hash != null) { return makeUrlToOpen(editor, relativePath, hash, githubRemoteUrl); } - GithubNotifications.showError(project, CANNOT_OPEN_IN_BROWSER, "Can't find related tracked branch or hash."); + GithubNotifications.showError(project, CANNOT_OPEN_IN_BROWSER, "Can't get last revision."); return null; } @@ -210,7 +205,7 @@ public class GithubOpenInBrowserAction extends DumbAwareAction { @Override public void run(@NotNull ProgressIndicator indicator) { try { - ref.set((GitRevisionNumber)GitHistoryUtils.getCurrentRevision(project, VcsUtil.getFilePath(file), null)); + ref.set((GitRevisionNumber)GitHistoryUtils.getCurrentRevision(project, VcsUtil.getFilePath(file), "HEAD")); } catch (VcsException e) { LOG.warn(e);