Skip to content

Commit 13470a4

Browse files
Wing-summerWing-summer
committed
fix: v2.3.6 的额外修复；
1 parent 50800d1 commit 13470a4

18 files changed

Lines changed: 559 additions & 824 deletions

‎3rdparty/AngelScript‎

‎3rdparty/angel-lsp‎

Submodule angel-lsp updated 22 files

‎3rdparty/as-debugger/as_debugger.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,8 +1299,10 @@ void asIDBFileWorkspace::CompileBreakpointPositions() {
12991299

13001300
/*static*/ void asIDBDebugger::ExceptionCallback(asIScriptContext *ctx,
13011301
asIDBDebugger *debugger) {
1302-
if (!debugger->internal_execution)
1302+
if (!debugger->internal_execution) {
1303+
debugger->ShowExceptionInfo(ctx);
13031304
debugger->DebugBreak(ctx);
1305+
}
13041306
}
13051307

13061308
void asIDBDebugger::HookContext(asIScriptContext *ctx, bool has_work) {
@@ -1382,3 +1384,5 @@ void asIDBDebugger::SetAction(asIDBAction new_action) {
13821384

13831385
Resume();
13841386
}
1387+
1388+
void asIDBDebugger::ShowExceptionInfo(asIScriptContext *) {}

‎3rdparty/as-debugger/as_debugger.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,9 @@ using asIDBBreakpointMap =
573573
// clear the cache context and call Resume.
574574
virtual void SetAction(asIDBAction new_action);
575575

576+
// show exception infomation when debugger receives
577+
virtual void ShowExceptionInfo(asIScriptContext *ctx);
578+
576579
protected:
577580
// called when the debugger is being asked to pause.
578581
// don't call directly, use DebugBreak.

‎lang/en_US/winghex_en_US.ts‎

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -188,47 +188,47 @@
188188
<context>
189189
<name>CodeEdit</name>
190190
<message>
191-
<location filename="../../src/control/codeedit.cpp" line="484"/>
191+
<location filename="../../src/control/codeedit.cpp" line="483"/>
192192
<source>Copy</source>
193193
<translation>Copy</translation>
194194
</message>
195195
<message>
196-
<location filename="../../src/control/codeedit.cpp" line="486"/>
196+
<location filename="../../src/control/codeedit.cpp" line="485"/>
197197
<source>Cut</source>
198198
<translation>Cut</translation>
199199
</message>
200200
<message>
201-
<location filename="../../src/control/codeedit.cpp" line="488"/>
201+
<location filename="../../src/control/codeedit.cpp" line="487"/>
202202
<source>Paste</source>
203203
<translation>Paste</translation>
204204
</message>
205205
<message>
206-
<location filename="../../src/control/codeedit.cpp" line="492"/>
206+
<location filename="../../src/control/codeedit.cpp" line="491"/>
207207
<source>Find</source>
208208
<translation>Find</translation>
209209
</message>
210210
<message>
211-
<location filename="../../src/control/codeedit.cpp" line="496"/>
211+
<location filename="../../src/control/codeedit.cpp" line="495"/>
212212
<source>Replace</source>
213213
<translation>Replace</translation>
214214
</message>
215215
<message>
216-
<location filename="../../src/control/codeedit.cpp" line="499"/>
216+
<location filename="../../src/control/codeedit.cpp" line="498"/>
217217
<source>Goto</source>
218218
<translation>Go to</translation>
219219
</message>
220220
<message>
221-
<location filename="../../src/control/codeedit.cpp" line="504"/>
221+
<location filename="../../src/control/codeedit.cpp" line="503"/>
222222
<source>Comment/UnComment</source>
223223
<translation>Comment/Uncomment</translation>
224224
</message>
225225
<message>
226-
<location filename="../../src/control/codeedit.cpp" line="508"/>
226+
<location filename="../../src/control/codeedit.cpp" line="507"/>
227227
<source>Fold/UnFold</source>
228228
<translation>Fold/Unfold</translation>
229229
</message>
230230
<message>
231-
<location filename="../../src/control/codeedit.cpp" line="515"/>
231+
<location filename="../../src/control/codeedit.cpp" line="514"/>
232232
<source>FoldAll</source>
233233
<translation>Fold all</translation>
234234
</message>
@@ -2821,12 +2821,12 @@
28212821
<translation>Options</translation>
28222822
</message>
28232823
<message>
2824-
<location filename="../../src/settings/qeditconfig.ui" line="167"/>
2824+
<location filename="../../src/settings/qeditconfig.ui" line="237"/>
28252825
<source>MatchBraces</source>
28262826
<translation>Match Braces</translation>
28272827
</message>
28282828
<message>
2829-
<location filename="../../src/settings/qeditconfig.ui" line="177"/>
2829+
<location filename="../../src/settings/qeditconfig.ui" line="197"/>
28302830
<source>AutoCloseChar</source>
28312831
<translation>Auto Close Char</translation>
28322832
</message>
@@ -2836,62 +2836,57 @@
28362836
<translation>Folding</translation>
28372837
</message>
28382838
<message>
2839-
<location filename="../../src/settings/qeditconfig.ui" line="197"/>
2839+
<location filename="../../src/settings/qeditconfig.ui" line="207"/>
28402840
<source>Whitespace</source>
28412841
<translation>Whitespace</translation>
28422842
</message>
28432843
<message>
2844-
<location filename="../../src/settings/qeditconfig.ui" line="207"/>
2844+
<location filename="../../src/settings/qeditconfig.ui" line="167"/>
28452845
<source>LineNumber</source>
28462846
<translation>Line Number</translation>
28472847
</message>
28482848
<message>
2849-
<location filename="../../src/settings/qeditconfig.ui" line="217"/>
2849+
<location filename="../../src/settings/qeditconfig.ui" line="177"/>
28502850
<source>WordWrap</source>
28512851
<translation>Word Wrap</translation>
28522852
</message>
28532853
<message>
28542854
<location filename="../../src/settings/qeditconfig.ui" line="227"/>
2855-
<source>LongLineEdge</source>
2856-
<translation>Long Line Edge</translation>
2857-
</message>
2858-
<message>
2859-
<location filename="../../src/settings/qeditconfig.ui" line="237"/>
28602855
<source>IndentGuides</source>
28612856
<translation>Indent Guides</translation>
28622857
</message>
28632858
<message>
2864-
<location filename="../../src/settings/qeditconfig.ui" line="247"/>
2859+
<location filename="../../src/settings/qeditconfig.ui" line="217"/>
28652860
<source>AutoIden</source>
28662861
<translation>Auto Indent</translation>
28672862
</message>
28682863
<message>
2869-
<location filename="../../src/settings/qeditconfig.cpp" line="162"/>
2864+
<location filename="../../src/settings/qeditconfig.cpp" line="159"/>
28702865
<source>Console</source>
28712866
<translation>Console</translation>
28722867
</message>
28732868
<message>
2874-
<location filename="../../src/settings/qeditconfig.cpp" line="166"/>
2869+
<location filename="../../src/settings/qeditconfig.cpp" line="163"/>
28752870
<source>Edit</source>
28762871
<translation>Edit</translation>
28772872
</message>
28782873
<message>
2879-
<location filename="../../src/settings/qeditconfig.cpp" line="310"/>
2874+
<location filename="../../src/settings/qeditconfig.cpp" line="304"/>
28802875
<source>Default</source>
28812876
<translation>Default</translation>
28822877
</message>
28832878
<message>
2884-
<location filename="../../src/settings/qeditconfig.cpp" line="320"/>
2879+
<location filename="../../src/settings/qeditconfig.cpp" line="314"/>
28852880
<source>IndentSpaces</source>
28862881
<translation>Indent Spaces</translation>
28872882
</message>
28882883
<message>
2889-
<location filename="../../src/settings/qeditconfig.cpp" line="321"/>
2884+
<location filename="../../src/settings/qeditconfig.cpp" line="315"/>
28902885
<source>IndentTabs</source>
28912886
<translation>Indent Tabs</translation>
28922887
</message>
28932888
<message>
2894-
<location filename="../../src/settings/qeditconfig.cpp" line="323"/>
2889+
<location filename="../../src/settings/qeditconfig.cpp" line="317"/>
28952890
<source>IndentMixed</source>
28962891
<translation>Indent Mixed</translation>
28972892
</message>
@@ -3163,81 +3158,81 @@
31633158
<translation>Console - Multi-line Input</translation>
31643159
</message>
31653160
<message>
3166-
<location filename="../../src/control/scriptingconsole.cpp" line="238"/>
3161+
<location filename="../../src/control/scriptingconsole.cpp" line="237"/>
31673162
<source>[Info]</source>
31683163
<translation>[Info]</translation>
31693164
</message>
31703165
<message>
3171-
<location filename="../../src/control/scriptingconsole.cpp" line="245"/>
3166+
<location filename="../../src/control/scriptingconsole.cpp" line="244"/>
31723167
<source>[Warn]</source>
31733168
<translation>[Warn]</translation>
31743169
</message>
31753170
<message>
3176-
<location filename="../../src/control/scriptingconsole.cpp" line="252"/>
3171+
<location filename="../../src/control/scriptingconsole.cpp" line="251"/>
31773172
<source>[Error]</source>
31783173
<translation>[Error]</translation>
31793174
</message>
31803175
<message>
3181-
<location filename="../../src/control/scriptingconsole.cpp" line="357"/>
3176+
<location filename="../../src/control/scriptingconsole.cpp" line="356"/>
31823177
<source>InvalidDelCmd</source>
31833178
<translation>Invalid delete command</translation>
31843179
</message>
31853180
<message>
3186-
<location filename="../../src/control/scriptingconsole.cpp" line="372"/>
3181+
<location filename="../../src/control/scriptingconsole.cpp" line="371"/>
31873182
<source>NotFoundIgnore:</source>
31883183
<translation>Variable not found, ignored:</translation>
31893184
</message>
31903185
<message>
3191-
<location filename="../../src/control/scriptingconsole.cpp" line="443"/>
3186+
<location filename="../../src/control/scriptingconsole.cpp" line="442"/>
31923187
<source>[Console]</source>
31933188
<translation>[Console]</translation>
31943189
</message>
31953190
<message>
3196-
<location filename="../../src/control/scriptingconsole.cpp" line="652"/>
3191+
<location filename="../../src/control/scriptingconsole.cpp" line="651"/>
31973192
<source>MultiCodeCanNotUndo</source>
31983193
<translation>Multiple lines of code cannot be modified after pasting.</translation>
31993194
</message>
32003195
<message>
3201-
<location filename="../../src/control/scriptingconsole.cpp" line="872"/>
3196+
<location filename="../../src/control/scriptingconsole.cpp" line="871"/>
32023197
<source>Copy</source>
32033198
<translation>Copy</translation>
32043199
</message>
32053200
<message>
3206-
<location filename="../../src/control/scriptingconsole.cpp" line="875"/>
3201+
<location filename="../../src/control/scriptingconsole.cpp" line="874"/>
32073202
<source>Cut</source>
32083203
<translation>Cut</translation>
32093204
</message>
32103205
<message>
3211-
<location filename="../../src/control/scriptingconsole.cpp" line="880"/>
3206+
<location filename="../../src/control/scriptingconsole.cpp" line="879"/>
32123207
<source>Paste</source>
32133208
<translation>Paste</translation>
32143209
</message>
32153210
<message>
3216-
<location filename="../../src/control/scriptingconsole.cpp" line="885"/>
3217-
<location filename="../../src/control/scriptingconsole.cpp" line="916"/>
3211+
<location filename="../../src/control/scriptingconsole.cpp" line="884"/>
3212+
<location filename="../../src/control/scriptingconsole.cpp" line="915"/>
32183213
<source>Clear</source>
32193214
<translation>Clear</translation>
32203215
</message>
32213216
<message>
3222-
<location filename="../../src/control/scriptingconsole.cpp" line="891"/>
3217+
<location filename="../../src/control/scriptingconsole.cpp" line="890"/>
32233218
<source>MutiConsole</source>
32243219
<translation>Multi-line Console</translation>
32253220
</message>
32263221
<message>
3227-
<location filename="../../src/control/scriptingconsole.cpp" line="905"/>
3222+
<location filename="../../src/control/scriptingconsole.cpp" line="904"/>
32283223
<source>AbortScript</source>
32293224
<translation>Terminate script</translation>
32303225
</message>
32313226
</context>
32323227
<context>
32333228
<name>ScriptingConsoleBase</name>
32343229
<message>
3235-
<location filename="../../src/control/scriptingconsolebase.cpp" line="105"/>
3230+
<location filename="../../src/control/scriptingconsolebase.cpp" line="96"/>
32363231
<source>Scripting console for WingHexExplorer</source>
32373232
<translation>Scripting console for WingHexExplorer</translation>
32383233
</message>
32393234
<message>
3240-
<location filename="../../src/control/scriptingconsolebase.cpp" line="107"/>
3235+
<location filename="../../src/control/scriptingconsolebase.cpp" line="98"/>
32413236
<source>&gt;&gt;&gt;&gt; Powered by AngelScript &lt;&lt;&lt;&lt;</source>
32423237
<translation>&gt;&gt;&gt;&gt; Powered by AngelScript &lt;&lt;&lt;&lt;</translation>
32433238
</message>
@@ -3382,7 +3377,7 @@
33823377
</message>
33833378
<message>
33843379
<location filename="../../src/dialog/scriptingdialog.cpp" line="469"/>
3385-
<location filename="../../src/dialog/scriptingdialog.cpp" line="2074"/>
3380+
<location filename="../../src/dialog/scriptingdialog.cpp" line="2073"/>
33863381
<source>Goto</source>
33873382
<translation>Go to</translation>
33883383
</message>
@@ -3636,7 +3631,7 @@
36363631
<location filename="../../src/dialog/scriptingdialog.cpp" line="1600"/>
36373632
<location filename="../../src/dialog/scriptingdialog.cpp" line="1629"/>
36383633
<location filename="../../src/dialog/scriptingdialog.cpp" line="1655"/>
3639-
<location filename="../../src/dialog/scriptingdialog.cpp" line="2036"/>
3634+
<location filename="../../src/dialog/scriptingdialog.cpp" line="2035"/>
36403635
<source>Error</source>
36413636
<translation>Error</translation>
36423637
</message>
@@ -3648,7 +3643,7 @@
36483643
<message>
36493644
<location filename="../../src/dialog/scriptingdialog.cpp" line="986"/>
36503645
<location filename="../../src/dialog/scriptingdialog.cpp" line="1233"/>
3651-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1922"/>
3646+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1921"/>
36523647
<source>ScriptStillRunning</source>
36533648
<translation>The script is still running. Are you sure to exit?</translation>
36543649
</message>
@@ -3684,7 +3679,7 @@
36843679
<translation>Access denied due to file permissions!</translation>
36853680
</message>
36863681
<message>
3687-
<location filename="../../src/dialog/scriptingdialog.cpp" line="2036"/>
3682+
<location filename="../../src/dialog/scriptingdialog.cpp" line="2035"/>
36883683
<source>BusyRunScript</source>
36893684
<translation>Script running busy</translation>
36903685
</message>
@@ -3749,18 +3744,18 @@
37493744
<translation>Save failed!</translation>
37503745
</message>
37513746
<message>
3752-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1728"/>
3747+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1727"/>
37533748
<source>FormatCodeFailed</source>
37543749
<translation>Code formatting failed</translation>
37553750
</message>
37563751
<message>
3757-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1783"/>
3752+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1782"/>
37583753
<source>LayoutRestoreBreak</source>
37593754
<translation>The editing views are not in the same area. Restoring the layout will disrupt the current simultaneous editing view arrangement. After restoration, they will be merged. Confirm to proceed?</translation>
37603755
</message>
37613756
<message>
3762-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1823"/>
3763-
<location filename="../../src/dialog/scriptingdialog.cpp" line="1851"/>
3757+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1822"/>
3758+
<location filename="../../src/dialog/scriptingdialog.cpp" line="1850"/>
37643759
<source>CannotSave2RunScript</source>
37653760
<translation>Unable to save, therefore unable to continue running the script.</translation>
37663761
</message>

0 commit comments

Comments
 (0)