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

notnull, cleanup

Browse Source 
GitOrigin-RevId: f30ab93c922aaefc4abbebd2ead4ac8b8404eecc
This commit is contained in:
Alexey Kudravtsev
2025-04-16 13:46:47 +00:00
committed by intellij-monorepo-bot
parent d7936732c4
commit 90f89bc774
7 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/pom/core/impl/PomModelImpl.java
+4 -1
View File
@@ -347,7 +347,10 @@ public class PomModelImpl extends UserDataHolderBase implements PomModel {
}
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(getPsiManager());
event.setParent(scope);
event.setFile(scope.getContainingFile());
PsiFile containingFile = scope.getContainingFile();
if (containingFile != null) {
event.setFile(containingFile);
}
TextRange range = scope.getTextRange();
event.setOffset(range == null ? 0 : range.getStartOffset());
event.setOldLength(scope.getTextLength());
platform/core-impl/src/com/intellij/pom/tree/events/impl/ChangeInfoImpl.java
+3 -3
View File
@@ -82,9 +82,9 @@ public class ChangeInfoImpl implements ChangeInfo {
}
}
static @NotNull PsiTreeChangeEventImpl createEvent(PsiFile file, int offset) {
PsiTreeChangeEventImpl e = new PsiTreeChangeEventImpl(file.getManager());
e.setFile(file);
static @NotNull PsiTreeChangeEventImpl createEvent(@NotNull PsiFile psiFile, int offset) {
PsiTreeChangeEventImpl e = new PsiTreeChangeEventImpl(psiFile.getManager());
e.setFile(psiFile);
e.setOffset(offset);
return e;
}
platform/core-impl/src/com/intellij/psi/AbstractFileViewProvider.java
+17 -17
View File
@@ -37,7 +37,7 @@ import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.LocalTimeCounter;
import com.intellij.util.containers.CollectionFactory;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.JBTreeTraverser;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -188,7 +188,7 @@ public abstract class AbstractFileViewProvider extends UserDataHolderBase implem
return getPsiInner(target);
}
protected abstract @Nullable PsiFile getPsiInner(Language target);
protected abstract @Nullable PsiFile getPsiInner(@NotNull Language target);
@SuppressWarnings("MethodDoesntCallSuperMethod")
@Override
@@ -249,12 +249,12 @@ public abstract class AbstractFileViewProvider extends UserDataHolderBase implem
}
public final void onContentReload() {
List<PsiFile> files = getCachedPsiFiles();
List<PsiTreeChangeEventImpl> events = new ArrayList<>(files.size());
List<PsiTreeChangeEventImpl> genericEvents = new ArrayList<>(files.size());
for (PsiFile file : files) {
genericEvents.add(createChildrenChangeEvent(file, true));
events.add(createChildrenChangeEvent(file, false));
List<PsiFile> psiFiles = getCachedPsiFiles();
List<PsiTreeChangeEventImpl> events = new ArrayList<>(psiFiles.size());
List<PsiTreeChangeEventImpl> genericEvents = new ArrayList<>(psiFiles.size());
for (PsiFile psiFile : psiFiles) {
genericEvents.add(createChildrenChangeEvent(psiFile, true));
events.add(createChildrenChangeEvent(psiFile, false));
}
beforeContentsSynchronized();
@@ -266,7 +266,7 @@ public abstract class AbstractFileViewProvider extends UserDataHolderBase implem
((PsiManagerImpl)getManager()).beforeChildrenChange(event);
}
for (PsiFile psiFile : files) {
for (PsiFile psiFile : psiFiles) {
if (psiFile instanceof PsiFileEx) {
((PsiFileEx)psiFile).onContentReload();
}
@@ -282,14 +282,14 @@ public abstract class AbstractFileViewProvider extends UserDataHolderBase implem
}
}
private PsiTreeChangeEventImpl createChildrenChangeEvent(PsiFile file, boolean generic) {
private @NotNull PsiTreeChangeEventImpl createChildrenChangeEvent(@NotNull PsiFile psiFile, boolean generic) {
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(myManager);
event.setParent(file);
event.setFile(file);
event.setParent(psiFile);
event.setFile(psiFile);
event.setGenericChange(generic);
if (file instanceof PsiFileImpl && ((PsiFileImpl)file).isContentsLoaded()) {
if (psiFile instanceof PsiFileImpl && ((PsiFileImpl)psiFile).isContentsLoaded()) {
event.setOffset(0);
event.setOldLength(file.getTextLength());
event.setOldLength(psiFile.getTextLength());
}
return event;
}
@@ -357,7 +357,7 @@ public abstract class AbstractFileViewProvider extends UserDataHolderBase implem
}
}
private boolean isDocumentConsistentWithPsi(int fileLength, FileASTNode fileElement, int nodeLength) {
private boolean isDocumentConsistentWithPsi(int fileLength, @NotNull FileASTNode fileElement, int nodeLength) {
if (nodeLength != fileLength) return false;
if (ApplicationManager.getApplication().isUnitTestMode() && !ApplicationManagerEx.isInStressTest()) {
@@ -403,10 +403,10 @@ public abstract class AbstractFileViewProvider extends UserDataHolderBase implem
}
}
private Iterable<AbstractFileViewProvider> getKnownCopies() {
private @NotNull Iterable<AbstractFileViewProvider> getKnownCopies() {
Set<AbstractFileViewProvider> copies = getUserData(KNOWN_COPIES);
if (copies != null) {
return JBIterable.from(copies).filter(copy -> copy.getCachedPsiFiles().stream().anyMatch(f -> f.getOriginalFile().getViewProvider() == this));
return ContainerUtil.filter(copies, copy -> ContainerUtil.exists(copy.getCachedPsiFiles(), f -> f.getOriginalFile().getViewProvider() == this));
}
return Collections.emptySet();
}
platform/core-impl/src/com/intellij/psi/DummyHolderViewProvider.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class DummyHolderViewProvider extends AbstractFileViewProvider {
}
@Override
protected @Nullable PsiFile getPsiInner(Language target) {
protected @Nullable PsiFile getPsiInner(@NotNull Language target) {
return getCachedPsi(target);
}
platform/core-impl/src/com/intellij/psi/impl/DiffLog.java
+16 -16
View File
@@ -105,19 +105,19 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
}
@Override
void doActualPsiChange(@NotNull PsiFile file, @NotNull TreeChangeEventImpl changeEvent) {
void doActualPsiChange(@NotNull PsiFile psiFile, @NotNull TreeChangeEventImpl changeEvent) {
ASTNode parent = ensureOldParent();
PsiElement psiParent = parent.getPsi();
PsiElement psiOldChild = file.isPhysical() ? myOldChild.getPsi() : null;
PsiElement psiOldChild = psiFile.isPhysical() ? myOldChild.getPsi() : null;
if (psiParent != null && psiOldChild != null) {
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(file.getManager());
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(psiFile.getManager());
event.setParent(psiParent);
event.setFile(file);
event.setFile(psiFile);
event.setOldChild(psiOldChild);
PsiElement psiNewChild = getPsi(myNewChild, file);
PsiElement psiNewChild = getPsi(myNewChild, psiFile);
event.setNewChild(psiNewChild);
((PsiManagerEx)file.getManager()).beforeChildReplacement(event);
((PsiManagerEx)psiFile.getManager()).beforeChildReplacement(event);
}
if (!(myOldChild instanceof FileElement) || !(myNewChild instanceof FileElement)) {
@@ -147,16 +147,16 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
}
@Override
void doActualPsiChange(@NotNull PsiFile file, @NotNull TreeChangeEventImpl changeEvent) {
void doActualPsiChange(@NotNull PsiFile psiFile, @NotNull TreeChangeEventImpl changeEvent) {
PsiElement psiParent = myOldParent.getPsi();
PsiElement psiChild = file.isPhysical() ? myOldNode.getPsi() : null;
PsiElement psiChild = psiFile.isPhysical() ? myOldNode.getPsi() : null;
if (psiParent != null && psiChild != null) {
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(file.getManager());
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(psiFile.getManager());
event.setParent(psiParent);
event.setChild(psiChild);
event.setFile(file);
((PsiManagerEx)file.getManager()).beforeChildRemoval(event);
event.setFile(psiFile);
((PsiManagerEx)psiFile.getManager()).beforeChildRemoval(event);
}
changeEvent.addElementaryChange(myOldParent);
@@ -179,7 +179,7 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
}
@Override
void doActualPsiChange(@NotNull PsiFile file, @NotNull TreeChangeEventImpl changeEvent) {
void doActualPsiChange(@NotNull PsiFile psiFile, @NotNull TreeChangeEventImpl changeEvent) {
ASTNode anchor = null;
ASTNode firstChildNode = myOldParent.getFirstChildNode();
for (int i = 0; i < myPos; i++) {
@@ -187,13 +187,13 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
}
PsiElement psiParent = myOldParent.getPsi();
PsiElement psiChild = getPsi(myNewNode, file);
PsiElement psiChild = getPsi(myNewNode, psiFile);
if (psiParent != null && psiChild != null) {
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(file.getManager());
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(psiFile.getManager());
event.setParent(psiParent);
event.setChild(psiChild);
event.setFile(file);
((PsiManagerEx)file.getManager()).beforeChildAddition(event);
event.setFile(psiFile);
((PsiManagerEx)psiFile.getManager()).beforeChildAddition(event);
}
changeEvent.addElementaryChange(myOldParent);
platform/core-impl/src/com/intellij/psi/impl/PsiToDocumentSynchronizer.java
+2 -2
View File
@@ -256,8 +256,8 @@ public class PsiToDocumentSynchronizer {
public static class DocumentChangeTransaction{
private final TreeMap<TextRange, CharSequence> myAffectedFragments = new TreeMap<>(Comparator.comparingInt(TextRange::getStartOffset));
private final PsiFile myChangeScope;
private ImmutableCharSequence myPsiText;
private final @NotNull PsiFile myChangeScope;
private @NotNull ImmutableCharSequence myPsiText;
DocumentChangeTransaction(@NotNull Document doc, @NotNull PsiFile scope) {
myChangeScope = scope;
platform/core-impl/src/com/intellij/psi/impl/PsiTreeChangeEventImpl.java
+2 -2
View File
@@ -79,8 +79,8 @@ public final class PsiTreeChangeEventImpl extends PsiTreeChangeEvent{
myNewValue = newValue;
}
public void setFile(PsiFile file) {
myFile = file;
public void setFile(@NotNull PsiFile psiFile) {
myFile = psiFile;
}
public void setOffset(int offset) {