diff --git a/CHANGELOG.md b/CHANGELOG.md index b3888305e..f92caa48a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Added -- [#1015], [#1466], [#1513] Better error messages during saving, display message on out of memory +- [#1015], [#1466], [#1513] Better error messages during saving, display message on out of memory +- [#1657] Option to disable adding second quote/bracket/parenthesis ### Fixed - PDF export - NullPointer when font of text is missing @@ -23,7 +24,7 @@ All notable changes to this project will be documented in this file. - PDF export - Smoothed bitmaps - Flash viewer - slow on larger zooms (now only diplayed rect is rendered) - Flash viewer - scaling grid - ignore nonshapes when scaling -- #1672 Raw editor - digits grouping causing incorrect cursor movement +- [#1672] Raw editor - digits grouping causing incorrect cursor movement - Rename invalid identifiers renames identifiers with a dollar sign ## [14.3.1] - 2021-03-25 @@ -2176,11 +2177,13 @@ All notable changes to this project will be documented in this file. [#1015]: https://www.free-decompiler.com/flash/issues/1015 [#1466]: https://www.free-decompiler.com/flash/issues/1466 [#1513]: https://www.free-decompiler.com/flash/issues/1513 +[#1657]: https://www.free-decompiler.com/flash/issues/1657 [#1660]: https://www.free-decompiler.com/flash/issues/1660 [#1669]: https://www.free-decompiler.com/flash/issues/1669 [#1668]: https://www.free-decompiler.com/flash/issues/1668 [#1670]: https://www.free-decompiler.com/flash/issues/1670 [#1671]: https://www.free-decompiler.com/flash/issues/1671 +[#1672]: https://www.free-decompiler.com/flash/issues/1672 [#1665]: https://www.free-decompiler.com/flash/issues/1665 [#1661]: https://www.free-decompiler.com/flash/issues/1661 [#1435]: https://www.free-decompiler.com/flash/issues/1435 diff --git a/lib/jsyntaxpane-0.9.5.jar b/lib/jsyntaxpane-0.9.5.jar index 173646d57..c36c619ec 100644 Binary files a/lib/jsyntaxpane-0.9.5.jar and b/lib/jsyntaxpane-0.9.5.jar differ diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java index 6255f04ae..7faa2e69e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -705,6 +705,22 @@ public final class Configuration { @ConfigurationInternal public static ConfigurationItem showSlowRenderingWarning = null; + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static ConfigurationItem autoCloseQuotes = null; + + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static ConfigurationItem autoCloseDoubleQuotes = null; + + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static ConfigurationItem autoCloseBrackets = null; + + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("script") + public static ConfigurationItem autoCloseParenthesis = null; + private enum OSId { WINDOWS, OSX, UNIX } diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config.properties index 58b8e0ed0..857c63c60 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ca.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ca.properties index 3c86f66f0..659aa82a2 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ca.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ca.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_cs.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_cs.properties index c05b4a832..d8b792fe1 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_cs.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_cs.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_de.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_de.properties index a8cc91999..ca7dcc445 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_de.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_de.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_es.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_es.properties index a4316acfe..9f4ca28ea 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_es.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_es.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_fr.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_fr.properties index fcfe70c1f..7fb0f0a50 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_fr.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_fr.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_hu.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_hu.properties index 79abcb8d1..09cccc66f 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_hu.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_hu.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_it.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_it.properties index a9231a1c6..0adf3d6c2 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_it.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_it.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ja.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ja.properties index 8a82b6cf3..015ea3b3f 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ja.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ja.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_nl.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_nl.properties index a857094cc..68a5f05cd 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_nl.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_nl.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pl.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pl.properties index 1bda309b1..68aba8ec4 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pl.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pl.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt.properties index 10c293036..d52d925d6 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt_BR.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt_BR.properties index fa42c5f96..027b28cc6 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt_BR.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_pt_BR.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ru.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ru.properties index 7041bda5a..d2d9f6182 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ru.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_ru.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_sv.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_sv.properties index 15b46ed91..8f742b892 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_sv.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_sv.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_tr.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_tr.properties index bd2ff73f7..ee1fd7f6a 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_tr.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_tr.properties @@ -22,11 +22,11 @@ SingleColorSelect = true # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_uk.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_uk.properties index e452d7580..5b4019cf7 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_uk.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_uk.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_zh.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_zh.properties index 1f2728081..0b08c84b9 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_zh.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_zh.properties @@ -18,10 +18,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config.properties index afa199bd0..db4e646f9 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ca.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ca.properties index 11c200151..1902926b9 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ca.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ca.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_cs.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_cs.properties index a4259a391..da4ce1ee1 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_cs.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_cs.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_de.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_de.properties index 2a1c6d588..2076e07fc 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_de.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_de.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_es.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_es.properties index 54d21c3b7..1a1939f4f 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_es.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_es.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_fr.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_fr.properties index 247a06ef3..2d24179f9 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_fr.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_fr.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_hu.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_hu.properties index 47883d249..e2a08e8dc 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_hu.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_hu.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_it.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_it.properties index f2fd7e2e4..65d000741 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_it.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_it.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ja.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ja.properties index b2c5c79ef..8b5a7b892 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ja.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ja.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_nl.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_nl.properties index e384576ef..25257af90 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_nl.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_nl.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pl.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pl.properties index 79776e482..38a103458 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pl.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pl.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt.properties index 1787924dd..3c39326bb 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt_BR.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt_BR.properties index e3760cc2b..8e25c8944 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt_BR.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_pt_BR.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ru.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ru.properties index 4751b9e6b..c46e9a4da 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ru.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_ru.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_sv.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_sv.properties index f8e6c33e9..fde4c8c68 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_sv.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_sv.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_tr.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_tr.properties index da6a29578..de10a0768 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_tr.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_tr.properties @@ -20,11 +20,11 @@ SingleColorSelect = true # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_uk.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_uk.properties index a861f2d26..24f648163 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_uk.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_uk.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_zh.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_zh.properties index 66fb25de2..2585a6395 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_zh.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_zh.properties @@ -16,10 +16,10 @@ SingleColorSelect = true # # Java Actions Action.indent.WordRegex=\\w+|\\/(\\*)+ -#Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( +Action.parenthesis = jsyntaxpane.actions.PairAction, typed ( Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3 Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker -#Action.brackets = jsyntaxpane.actions.PairAction, typed [ +Action.brackets = jsyntaxpane.actions.PairAction, typed [ Action.quotes = jsyntaxpane.actions.PairAction, typed ' Action.double-quotes = jsyntaxpane.actions.PairAction, typed " # For completions, you have to define the Action (key to trigger completions): diff --git a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java index e4e4a3b51..db8b3e641 100644 --- a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java +++ b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java @@ -29,11 +29,13 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JEditorPane; +import javax.swing.KeyStroke; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.EditorKit; +import javax.swing.text.JTextComponent; import jsyntaxpane.SyntaxDocument; /** @@ -93,6 +95,30 @@ public class UndoFixedEditorPane extends JEditorPane { setFont(oldFont); addDocumentListener(); } + + if (!Configuration.autoCloseQuotes.get()) { + getActionMap().remove("quotes"); + KeyStroke ks = KeyStroke.getKeyStroke("typed '"); + getInputMap(JTextComponent.WHEN_FOCUSED).remove(ks); + } + + if (!Configuration.autoCloseDoubleQuotes.get()) { + getActionMap().remove("double-quotes"); + KeyStroke ks = KeyStroke.getKeyStroke("typed \""); + getInputMap(JTextComponent.WHEN_FOCUSED).remove(ks); + } + + if (!Configuration.autoCloseBrackets.get()) { + getActionMap().remove("brackets"); + KeyStroke ks = KeyStroke.getKeyStroke("typed ["); + getInputMap(JTextComponent.WHEN_FOCUSED).remove(ks); + } + + if (!Configuration.autoCloseParenthesis.get()) { + getActionMap().remove("parenthesis"); + KeyStroke ks = KeyStroke.getKeyStroke("typed ("); + getInputMap(JTextComponent.WHEN_FOCUSED).remove(ks); + } } @Override diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index b1d26cda8..f97925f27 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -526,3 +526,14 @@ config.description.limitAs3PCodeOffsetMatching = Limit of instructions in AS3 P- config.name.showSlowRenderingWarning = Log warning when rendering is too slow config.description.showSlowRenderingWarning = Logs warning when internal flash viewer is too slow to display content +config.name.autoCloseQuotes = Auto close single quotes on script edit +config.description.autoCloseQuotes = Automatically inserts second single quote ' on typing first one + +config.name.autoCloseDoubleQuotes = Auto close double quotes on script edit +config.description.autoCloseDoubleQuotes = Automatically inserts second double quote " on typing first one + +config.name.autoCloseBrackets = Auto close brackets on script edit +config.description.autoCloseBrackets = Automatically inserts closing bracket ] on typing opening [ + +config.name.autoCloseParenthesis = Auto close parenthesis on script edit +config.description.autoCloseParenthesis = Automatically inserts closing parenthesis ) on typing opening ( diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties index 11061cab0..ddbb0525c 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties @@ -516,4 +516,16 @@ config.name.limitAs3PCodeOffsetMatching = Limit matchov\u00e1n\u00ed offset\u016 config.description.limitAs3PCodeOffsetMatching = Limit instrukc\u00ed v AS3 p-k\u00f3du kter\u00e9 jsou matchovan\u00e9 offsetem na AS3 skript config.name.showSlowRenderingWarning = Zalogovat varov\u00e1n\u00ed kdy\u017e je renderov\u00e1n\u00ed p\u0159\u00edli\u0161 pomal\u00e9 -config.description.showSlowRenderingWarning = Zaloguje varov\u00e1n\u00ed kdy\u017e intern\u00ed zobrazova\u010d flashe je p\u0159\u00edli\u0161 pomal\u00fd na zobrazen\u00ed obsahu \ No newline at end of file +config.description.showSlowRenderingWarning = Zaloguje varov\u00e1n\u00ed kdy\u017e intern\u00ed zobrazova\u010d flashe je p\u0159\u00edli\u0161 pomal\u00fd na zobrazen\u00ed obsahu + +config.name.autoCloseQuotes = Automaticky uzav\u00edrat jednoduch\u00e9 uvozovky p\u0159i editov\u00e1n\u00ed skriptu +config.description.autoCloseQuotes = Automaticky vlo\u017e\u00ed druhou jednoduchou uvozovku ' po naps\u00e1n\u00ed prvn\u00ed + +config.name.autoCloseDoubleQuotes = Automaticky uzav\u00edrat dvojit\u00e9 uvozovky p\u0159i editov\u00e1n\u00ed skriptu +config.description.autoCloseDoubleQuotes = Automaticky vlo\u017e\u00ed druhou dvojitou uvozovku " po naps\u00e1n\u00ed prvn\u00ed + +config.name.autoCloseBrackets = Automaticky uzav\u00edrat hranat\u00e9 z\u00e1vorky p\u0159i editov\u00e1n\u00ed skriptu +config.description.autoCloseBrackets = Automaticky vlo\u017e\u00ed uzav\u00edrac\u00ed hranatou z\u00e1vorku ] p\u0159i naps\u00e1n\u00ed otev\u00edrac\u00ed [ + +config.name.autoCloseParenthesis = Automaticky uzav\u00edrat kulat\u00e9 z\u00e1vorky p\u0159i editov\u00e1n\u00ed skriptu +config.description.autoCloseParenthesis = Automaticky vlo\u017e\u00ed uzav\u00edrac\u00ed kulatou z\u00e1vorku ) p\u0159i naps\u00e1n\u00ed otev\u00edrac\u00ed ( \ No newline at end of file