LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-19 00:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1977 AS3 Find usages - class and function usages, various fixes

Browse Source
This commit is contained in:
Jindra Petřík
2023-02-19 20:47:57 +01:00
parent 45f807940a
commit 76eff8b53c
21 changed files with 281 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
View File

@@ -1104,7 +1104,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
Reference<ABC> usedAbc = new Reference<>(null);
int multinameIndex = decompiledTextArea.getMultinameUnderCaret(usedAbc);
if (multinameIndex > -1) {
UsageFrame usageFrame = new UsageFrame(usedAbc.getVal(), multinameIndex, ABCPanel.this, false);
UsageFrame usageFrame = new UsageFrame(usedAbc.getVal(), multinameIndex, false, ABCPanel.this, false);
usageFrame.setVisible(true);
}
}
@@ -1166,7 +1166,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
}
int multinameIndex = constantTable.convertRowIndexToModel(rowIndex);
if (multinameIndex > 0) {
UsageFrame usageFrame = new UsageFrame(abc, multinameIndex, t, false);
UsageFrame usageFrame = new UsageFrame(abc, multinameIndex, true, t, false);
usageFrame.setVisible(true);
}
}
@@ -1297,7 +1297,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
//more than one? display list
if (usages.size() > 1) {
UsageFrame usageFrame = new UsageFrame(usedAbc, multinameIndex, ABCPanel.this, true);
UsageFrame usageFrame = new UsageFrame(usedAbc, multinameIndex, false, ABCPanel.this, true);
usageFrame.setVisible(true);
return;
} else if (!usages.isEmpty()) { //one

22
src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
View File

@@ -576,6 +576,7 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL
Highlighting sh = Highlighting.searchPos(highlightedText.getSpecialHighlights(), pos);
if (sh != null) {
switch (sh.getProperties().subtype) {
case CLASS_NAME:
case TYPE_NAME:
String typeName = sh.getProperties().specialValue;
for (int i = 1; i < abc.constants.getMultinameCount(); i++) {
@@ -594,7 +595,8 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL
break;
case TRAIT_NAME:
if (currentTrait != null) {
//return currentTrait.name_index;
//TODO: this should be handled better = to match method usages on the same class, not all matching classes. But that requires decompiling target usages.
return currentTrait.name_index;
}
break;
case RETURNS:
@@ -735,6 +737,24 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL
}
}
/**
* WARNING: This won't change script. This only hilights class in current script
*/
public void gotoClassHeader() {
Highlighting tc = Highlighting.searchIndex(highlightedText.getClassHighlights(), classIndex);
if (tc != null) {
final int fpos = tc.startPos;
new Timer().schedule(new TimerTask() {
@Override
public void run() {
if (fpos <= getDocument().getLength()) {
setCaretPosition(fpos);
}
}
}, 100);
}
}
public void gotoTrait(int traitId) {
boolean isScriptInit = traitId == GraphTextWriter.TRAIT_SCRIPT_INITIALIZER;

31
src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java
View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui.abc;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.types.Multiname;
import com.jpexs.decompiler.flash.abc.types.Namespace;
import com.jpexs.decompiler.flash.abc.types.traits.TraitType;
import com.jpexs.decompiler.flash.abc.usages.InsideClassMultinameUsageInterface;
import com.jpexs.decompiler.flash.abc.usages.MethodMultinameUsage;
import com.jpexs.decompiler.flash.abc.usages.MultinameUsage;
@@ -55,10 +56,18 @@ public class UsageFrame extends AppDialog implements MouseListener {
private final ABCPanel abcPanel;
public UsageFrame(ABC abc, int multinameIndex, ABCPanel abcPanel, boolean definitions) {
/**
*
* @param abc
* @param multinameIndex
* @param exactMatch False = also consider Multiname.MULTINAME kind equal to QNAME with same name+namespace in the list. This is used in some of "extends/implements" cause.
* @param abcPanel
* @param definitions
*/
public UsageFrame(ABC abc, int multinameIndex, boolean exactMatch, ABCPanel abcPanel, boolean definitions) {
super(abcPanel.getMainPanel().getMainFrame().getWindow());
this.abcPanel = abcPanel;
List<MultinameUsage> usages = definitions ? abc.findMultinameDefinition(multinameIndex) : abc.findMultinameUsage(multinameIndex);
this.abcPanel = abcPanel;
List<MultinameUsage> usages = definitions ? abc.findMultinameDefinition(multinameIndex) : abc.findMultinameUsage(multinameIndex, exactMatch);
Multiname m = abc.constants.getMultiname(multinameIndex);
if (m.namespace_index > 0 && abc.constants.getNamespace(m.namespace_index).kind != Namespace.KIND_PRIVATE) {
for (ABCContainerTag at : abc.getAbcTags()) {
@@ -68,7 +77,7 @@ public class UsageFrame extends AppDialog implements MouseListener {
}
List<Integer> mids = a.constants.getMultinameIds(m, abc.constants);
for (int mid : mids) {
usages.addAll(definitions ? a.findMultinameDefinition(mid) : a.findMultinameUsage(mid));
usages.addAll(definitions ? a.findMultinameDefinition(mid) : a.findMultinameUsage(mid, exactMatch));
}
}
}
@@ -126,10 +135,12 @@ public class UsageFrame extends AppDialog implements MouseListener {
if (tmu instanceof MethodMultinameUsage) {
MethodMultinameUsage mmu = (MethodMultinameUsage) usage;
if (mmu.isInitializer() == true) {
traitIndex = newAbc.class_info.get(mmu.getClassIndex()).static_traits.traits.size() + newAbc.instance_info.get(mmu.getClassIndex()).instance_traits.traits.size() + (mmu.getTraitsType() == TraitMultinameUsage.TRAITS_TYPE_CLASS ? 1 : 0);
traitIndex = mmu.getAbc().getGlobalTraitId(mmu.getClassIndex() == -1 ? TraitType.SCRIPT_INITIALIZER : TraitType.INITIALIZER, mmu.getTraitsType() == TraitMultinameUsage.TRAITS_TYPE_CLASS, -1, -1);
}
}
decompiledTextArea.gotoTrait(traitIndex);
} else {
decompiledTextArea.gotoClassHeader();
}
}
};
@@ -138,7 +149,15 @@ public class UsageFrame extends AppDialog implements MouseListener {
setTrait.run();
} else {
decompiledTextArea.addScriptListener(setTrait);
abcPanel.hilightScript(abcPanel.getOpenable(), icu.getAbc().instance_info.get(icu.getClassIndex()).getName(icu.getAbc().constants).getNameWithNamespace(icu.getAbc().constants, true).toRawString());
String scriptName;
if (icu.getClassIndex() > -1) {
scriptName = icu.getAbc().instance_info.get(icu.getClassIndex()).getName(icu.getAbc().constants).getNameWithNamespace(icu.getAbc().constants, true).toRawString();
} else if (icu.getScriptIndex() > -1) {
scriptName = icu.getAbc().script_info.get(icu.getScriptIndex()).getSimplePackName(icu.getAbc()).toRawString();
} else {
scriptName = "";
}
abcPanel.hilightScript(abcPanel.getOpenable(), scriptName);
}
}
}