MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vladimir.Orlov
2015-09-01 15:33:03 +03:00
parent f7995a34fa c58489087c
commit 663bf820fa
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionsFilter.java
+1 -1
View File
@@ -117,7 +117,7 @@ public abstract class InspectionsFilter {
return false;
}
if (myAvailableOnlyForAnalyze != isAvailableOnlyForAnalyze(tools)) {
if (myAvailableOnlyForAnalyze && !isAvailableOnlyForAnalyze(tools)) {
return false;
}
platform/platform-resources-en/src/messages/ExecutionBundle.properties
+1 -1
View File
@@ -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
platform/util/src/com/intellij/util/ThrowablePairConsumer.java
+23
View File
@@ -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<P,S,T extends Throwable> {
void consume(P p, S s) throws T;
}
plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java
+2 -7
View File
@@ -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);