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

cleanup

Browse Source 
GitOrigin-RevId: f3e91b58355e79556aa767ae4a6acc66f6e40b36
This commit is contained in:
Vladimir Krivosheev
2020-06-19 10:17:19 +03:00
committed by intellij-monorepo-bot
parent 1f5cba2ebf
commit 42cbb72e1e
4 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/src/ProjectStoreBase.kt
+2 -1
View File
@@ -272,7 +272,8 @@ abstract class ProjectStoreBase(final override val project: Project) : Component
override fun getDirectoryStorePathOrBase(): String = PathUtil.getParentPath(projectFilePath)
override suspend fun doSave(result: SaveResult, forceSavingAllSettings: Boolean) { } // dummy implementation for Upsource
// dummy implementation for Upsource
override suspend fun doSave(result: SaveResult, forceSavingAllSettings: Boolean) { }
}
private fun composeFileBasedProjectWorkSpacePath(filePath: String) = "${FileUtil.getNameWithoutExtension(filePath)}${WorkspaceFileType.DOT_DEFAULT_EXTENSION}"
platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/FileInfo.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ListWithSelection;
class FileInfo {
final class FileInfo {
private final VirtualFile myFile;
private final ListWithSelection<HandleType> myHandleType = new ListWithSelection<>();
platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java
+36 -20
View File
@@ -12,34 +12,47 @@ import com.intellij.openapi.components.Storage;
import com.intellij.openapi.components.StoragePathMacros;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.MultiValuesMap;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.Strings;
import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.WritingAccessProvider;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import static com.intellij.openapi.util.text.StringUtil.isEmpty;
import java.util.*;
@State(name = "ReadonlyStatusHandler", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements PersistentStateComponent<ReadonlyStatusHandlerImpl.State> {
public final class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements PersistentStateComponent<ReadonlyStatusHandlerImpl.State> {
private static final Logger LOG = Logger.getInstance(ReadonlyStatusHandlerImpl.class);
private final Project myProject;
protected boolean myClearReadOnlyInTests;
public static class State {
private final Project myProject;
private boolean myClearReadOnlyInTests;
public static final class State {
public boolean SHOW_DIALOG = true;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
State state = (State)o;
if (SHOW_DIALOG != state.SHOW_DIALOG) return false;
return true;
}
@Override
public int hashCode() {
return (SHOW_DIALOG ? 1 : 0);
}
}
private State myState = new State();
@@ -68,7 +81,7 @@ public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements
checkThreading();
Set<VirtualFile> realFiles = new THashSet<>(originalFiles.size());
Set<VirtualFile> realFiles = new HashSet<>(originalFiles.size());
for (VirtualFile file : originalFiles) {
if (file instanceof LightVirtualFile) {
VirtualFile originalFile = ((LightVirtualFile)file).getOriginalFile();
@@ -76,7 +89,9 @@ public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements
file = originalFile;
}
}
if (file instanceof VirtualFileWindow) file = ((VirtualFileWindow)file).getDelegate();
if (file instanceof VirtualFileWindow) {
file = ((VirtualFileWindow)file).getDelegate();
}
if (file != null) {
realFiles.add(file);
}
@@ -166,11 +181,11 @@ public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements
return fileInfos;
}
public static void processFiles(final List<FileInfo> fileInfos, @Nullable String changelist) {
public static void processFiles(@NotNull List<FileInfo> fileInfos, @Nullable String changelist) {
FileInfo[] copy = fileInfos.toArray(new FileInfo[0]);
MultiValuesMap<HandleType, VirtualFile> handleTypeToFile = new MultiValuesMap<>();
MultiMap<HandleType, VirtualFile> handleTypeToFile = new MultiMap<>();
for (FileInfo fileInfo : copy) {
handleTypeToFile.put(fileInfo.getSelectedHandleType(), fileInfo.getFile());
handleTypeToFile.putValue(fileInfo.getSelectedHandleType(), fileInfo.getFile());
}
for (HandleType handleType : handleTypeToFile.keySet()) {
@@ -197,8 +212,7 @@ public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements
myClearReadOnlyInTests = clearReadOnlyInTests;
}
private static class OperationStatusImpl extends OperationStatus {
private static final class OperationStatusImpl extends OperationStatus {
private final VirtualFile[] myReadonlyFiles;
@NotNull private final String myReadOnlyReason;
@@ -225,7 +239,9 @@ public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements
@NotNull
public String getReadonlyFilesMessage() {
if (hasReadonlyFiles()) {
if (!isEmpty(myReadOnlyReason)) return myReadOnlyReason;
if (!Strings.isEmpty(myReadOnlyReason)) {
return myReadOnlyReason;
}
if (myReadonlyFiles.length > 1) {
StringBuilder buf = new StringBuilder();
for (VirtualFile file : myReadonlyFiles) {
platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PatchMatcherTest.java
+2 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.vcs;
import com.intellij.openapi.diff.impl.patch.TextFilePatch;
@@ -12,14 +12,12 @@ import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import static com.intellij.openapi.vcs.PatchAutoInitTest.create;
public class PatchMatcherTest extends HeavyPlatformTestCase {
public void testMatchPathAboveProject() {
Path ioFile = Paths.get(myProject.getBasePath()).getParent().resolve("file.txt");
PathKt.createFile(ioFile);
myFilesToDelete.add(ioFile);
TextFilePatch patch = create("../file.txt");
TextFilePatch patch = PatchAutoInitTest.create("../file.txt");
MatchPatchPaths iterator = new MatchPatchPaths(myProject);
List<AbstractFilePatchInProgress> filePatchInProgresses = iterator.execute(Collections.singletonList(patch));