azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 162.1447.7

Browse Source
This commit is contained in:
Nikolay Krasko
2016-07-26 19:14:57 +03:00
parent 329c1a1e72
commit 4b9b3b07e7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java
+11 -3
View File
@@ -22,17 +22,25 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.SingleRootFileViewProvider; import com.intellij.psi.SingleRootFileViewProvider;
import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.file.impl.FileManager; import com.intellij.psi.impl.file.impl.FileManager;
import com.intellij.util.containers.WeakFactoryMap; import com.intellij.util.containers.ConcurrentWeakFactoryMap;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FactoryMap;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
import java.util.Map;
public class MockFileManager implements FileManager { public class MockFileManager implements FileManager {
private final PsiManagerEx myManager; private final PsiManagerEx myManager;
// in mock tests it's LightVirtualFile, they're only alive when they're referenced, // in mock tests it's LightVirtualFile, they're only alive when they're referenced,
// and there can not be several instances representing the same file // and there can not be several instances representing the same file
private final WeakFactoryMap<VirtualFile, FileViewProvider> myViewProviders = new WeakFactoryMap<VirtualFile, FileViewProvider>() { private final FactoryMap<VirtualFile, FileViewProvider> myViewProviders = new ConcurrentWeakFactoryMap<VirtualFile, FileViewProvider>() {
@Override
protected Map<VirtualFile, FileViewProvider> createMap() {
return ContainerUtil.createConcurrentWeakKeyWeakValueMap();
}
@Override @Override
protected FileViewProvider create(VirtualFile key) { protected FileViewProvider create(VirtualFile key) {
return new SingleRootFileViewProvider(myManager, key); return new SingleRootFileViewProvider(myManager, key);
update_dependencies.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless"> <project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless">
<property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/> <property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
<property name="ideaVersion" value="162.1121.32"/> <property name="ideaVersion" value="162.1447.7"/>
<property name="idea.kotlin.branch" value="rc"/> <property name="idea.kotlin.branch" value="rc"/>