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:
Konstantin Bulenkov
2017-06-06 08:49:33 +02:00
parent c7b508ffc9 d7d02ad2ac
commit e4e4ab3c32
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/win/elevator.exe
BIN
View File
Binary file not shown.
native/WinElevator/elevator/elevator.c
+1 -7
View File
@@ -53,13 +53,7 @@ static DWORD _ConnectIfNeededPipe(DWORD nParentPid, DWORD nDescriptor, FILE* str
if (!SetHandleInformation(hPipe, HANDLE_FLAG_INHERIT, TRUE))
{
return GetLastError();
}
// Fix CRT
if (_dup2(_open_osfhandle((intptr_t)hPipe, _O_WTEXT | _O_TEXT), _fileno(stream)) != 0)
{
return errno;
}
}
// Fix Win32API
DWORD hStdHandleToChange = ELEV_DESCR_GET_HANDLE(nDescriptor);
platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
+28
View File
@@ -30,7 +30,9 @@ import com.intellij.psi.search.PsiElementProcessor.FindElement;
import com.intellij.psi.stubs.StubBase;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.templateLanguages.OuterLanguageElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import com.intellij.util.PairProcessor;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
@@ -661,6 +663,32 @@ public class PsiTreeUtil {
return (T)element;
}
@Nullable
public static PsiElement findSiblingForward(@NotNull final PsiElement element,
@NotNull final IElementType elementType,
@Nullable final Consumer<PsiElement> consumer) {
for (PsiElement e = element.getNextSibling(); e != null; e = e.getNextSibling()) {
if (elementType.equals(e.getNode().getElementType())) {
return e;
}
if (consumer != null) consumer.consume(e);
}
return null;
}
@Nullable
public static PsiElement findSiblingBackward(@NotNull final PsiElement element,
@NotNull final IElementType elementType,
@Nullable final Consumer<PsiElement> consumer) {
for (PsiElement e = element.getPrevSibling(); e != null; e = e.getPrevSibling()) {
if (elementType.equals(e.getNode().getElementType())) {
return e;
}
if (consumer != null) consumer.consume(e);
}
return null;
}
@Nullable
@Contract("null, _ -> null")
public static PsiElement skipSiblingsForward(@Nullable PsiElement element, @NotNull Class... elementClasses) {