MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

[bytecode viewer] remove optimistic assertion, fix EA-1209082

Browse Source 
Also fix some warnings

GitOrigin-RevId: aeef7ca5f25388a231f8ac52393f3fcf1421a99c
This commit is contained in:
Vladimir Parfinenko
2024-05-21 11:29:29 +02:00
committed by intellij-monorepo-bot
parent aa7bda229a
commit 28cabb955c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml
View File

@@ -20,5 +20,6 @@
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.java.frontback.psi.impl" />
</component>
</module>

9
plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerComponent.java
View File

@@ -16,6 +16,7 @@
package com.intellij.byteCodeViewer;
import com.intellij.execution.filters.LineNumbersMapping;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.colors.EditorColorsManager;
@@ -23,7 +24,6 @@ import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
import com.intellij.openapi.editor.impl.EditorFactoryImpl;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.project.Project;
@@ -50,7 +50,7 @@ public class ByteCodeViewerComponent extends JPanel implements Disposable {
doc.setReadOnly(true);
myEditor = factory.createEditor(doc, project);
EditorHighlighterFactory editorHighlighterFactory = EditorHighlighterFactory.getInstance();
final SyntaxHighlighter syntaxHighlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(StdFileTypes.JAVA, project, null);
final SyntaxHighlighter syntaxHighlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(JavaFileType.INSTANCE, project, null);
((EditorEx)myEditor).setHighlighter(editorHighlighterFactory.createEditorHighlighter(syntaxHighlighter, EditorColorsManager.getInstance().getGlobalScheme()));
((EditorEx)myEditor).setCaretVisible(true);
@@ -87,8 +87,9 @@ public class ByteCodeViewerComponent extends JPanel implements Disposable {
int bytecodeLine = mapping.sourceToBytecode(l);
if (bytecodeLine != -1) {
offset = findLineNumber(bytecode, bytecodeLine);
assert offset != -1 : "there is bytecode line in mapping but it is missing in bytecode";
break;
if (offset != -1) {
break;
}
}
}
}