From c8ad42cf9b060d041b8d31e11ff471670e5f9920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 26 May 2025 23:17:18 +0200 Subject: [PATCH] AS1/2 variables hiligter fix - throw, targetPath --- .../action/parser/script/ActionScript2VariableParser.java | 3 ++- src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScript2VariableParser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScript2VariableParser.java index 398696a11..477ceede8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScript2VariableParser.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScript2VariableParser.java @@ -898,7 +898,7 @@ public class ActionScript2VariableParser { break; case TARGETPATH: expectedType(SymbolType.PARENT_OPEN); - //ret = new TargetPathActionItem(null, null, (expression(inFunction, inMethod, inTellTarget, true, variables, functions, false, hasEval))); + expression(inFunction, inMethod, inTellTarget, true, variables, functions, false, hasEval); expectedType(SymbolType.PARENT_CLOSE); ret = true; break; @@ -1389,6 +1389,7 @@ public class ActionScript2VariableParser { case THROW: //ret = new ThrowActionItem(null, null, ; expression(inFunction, inMethod, inTellTarget, true, variables, functions, false, hasEval); + ret = true; break; case SEMICOLON: //empty command if (debugMode) { diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java index a9fb8b07b..44346175f 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbon.java @@ -30,7 +30,6 @@ import com.jpexs.helpers.Helper; import com.sun.jna.Native; import com.sun.jna.Platform; import com.sun.jna.win32.StdCallLibrary; -import com.sun.jna.win32.W32APIOptions; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -51,20 +50,13 @@ import java.awt.event.WindowStateListener; import java.awt.geom.AffineTransform; import java.io.File; import java.util.List; -import javax.swing.Icon; -import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.plaf.RootPaneUI; import org.pushingpixels.flamingo.api.ribbon.JRibbon; import org.pushingpixels.flamingo.internal.ui.ribbon.appmenu.JRibbonApplicationMenuButton; -import org.pushingpixels.substance.api.DecorationAreaType; -import org.pushingpixels.substance.api.SubstanceColorScheme; import org.pushingpixels.substance.flamingo.ribbon.ui.SubstanceRibbonRootPaneUI; -import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities; import org.pushingpixels.substance.internal.utils.SubstanceSizeUtils; -import org.pushingpixels.substance.internal.utils.icon.SubstanceIconFactory; -import org.pushingpixels.substance.internal.utils.icon.TransitionAwareIcon; /** * @author JPEXS