Compilation fixes for 172 branch
This commit is contained in:
committed by
Nikolay Krasko
parent
c1cfd70ae7
commit
48d4f5f5c2
+23
@@ -19,6 +19,7 @@ import com.intellij.openapi.Disposable;
|
|||||||
import com.intellij.openapi.editor.Document;
|
import com.intellij.openapi.editor.Document;
|
||||||
import com.intellij.openapi.editor.Editor;
|
import com.intellij.openapi.editor.Editor;
|
||||||
import com.intellij.openapi.editor.EditorFactory;
|
import com.intellij.openapi.editor.EditorFactory;
|
||||||
|
import com.intellij.openapi.editor.EditorKind;
|
||||||
import com.intellij.openapi.editor.event.EditorEventMulticaster;
|
import com.intellij.openapi.editor.event.EditorEventMulticaster;
|
||||||
import com.intellij.openapi.editor.event.EditorFactoryListener;
|
import com.intellij.openapi.editor.event.EditorFactoryListener;
|
||||||
import com.intellij.openapi.editor.impl.DocumentImpl;
|
import com.intellij.openapi.editor.impl.DocumentImpl;
|
||||||
@@ -27,6 +28,7 @@ import com.intellij.openapi.project.Project;
|
|||||||
import com.intellij.openapi.vfs.VirtualFile;
|
import com.intellij.openapi.vfs.VirtualFile;
|
||||||
import com.intellij.util.text.CharArrayCharSequence;
|
import com.intellij.util.text.CharArrayCharSequence;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class MockEditorFactory extends EditorFactory {
|
public class MockEditorFactory extends EditorFactory {
|
||||||
@Override
|
@Override
|
||||||
@@ -59,6 +61,27 @@ public class MockEditorFactory extends EditorFactory {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Editor createEditor(
|
||||||
|
@NotNull Document document, @Nullable Project project, @NotNull EditorKind kind
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Editor createEditor(
|
||||||
|
@NotNull Document document, Project project, @NotNull VirtualFile file, boolean isViewer, @NotNull EditorKind kind
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Editor createViewer(
|
||||||
|
@NotNull Document document, @Nullable Project project, @NotNull EditorKind kind
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void releaseEditor(@NotNull Editor editor) {
|
public void releaseEditor(@NotNull Editor editor) {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ private fun readClassFileImpl(project: Project,
|
|||||||
fun readFromOutput(isForTestClasses: Boolean): ByteArray? {
|
fun readFromOutput(isForTestClasses: Boolean): ByteArray? {
|
||||||
if (!ProjectRootsUtil.isProjectSourceFile(project, file)) return null
|
if (!ProjectRootsUtil.isProjectSourceFile(project, file)) return null
|
||||||
|
|
||||||
val module = ProjectFileIndex.SERVICE.getInstance(project).getModuleForFile(file)
|
val module = ProjectFileIndex.SERVICE.getInstance(project).getModuleForFile(file) ?: return null
|
||||||
val outputDir = CompilerPaths.getModuleOutputDirectory(module, /*forTests = */ isForTestClasses) ?: return null
|
val outputDir = CompilerPaths.getModuleOutputDirectory(module, /*forTests = */ isForTestClasses) ?: return null
|
||||||
|
|
||||||
val className = fqNameWithInners.asString().replace('.', '$')
|
val className = fqNameWithInners.asString().replace('.', '$')
|
||||||
|
|||||||
Reference in New Issue
Block a user