From ef9b74cb23a70893513d560e7be7cfca63d438fc Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sat, 11 Feb 2017 20:27:20 +0100 Subject: [PATCH] messages, handle stack trace format --- src/ce_messages.pas | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ce_messages.pas b/src/ce_messages.pas index ae39c520..b592fe8f 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -1056,8 +1056,8 @@ begin if aMessage.isEmpty then exit; rng.init(aMessage); - rng.popUntil('(')^.popWhile('('); - lne := rng.takeUntil([',', ':', ')']).yield; + rng.popUntil(['(', ':'])^.popWhile(['(', ':']); + lne := rng.takeUntil([',', ':', ')', ' ']).yield; if rng.front in [',', ':'] then col := rng.popWhile([',', ':'])^.takeUntil(')').yield; result.y := strToIntDef(lne, -1); @@ -1078,9 +1078,9 @@ begin exit; // '(': line will be indicated after fname // -mixin: dmd, error in mixin(token string) '-mixinXX(' - if isEditable(ident.extractFileExt) and ((aMessage[i] = '(') or - ((aMessage[i] = '-') and (i < aMessage.length-5) - and (aMessage[i..i+5] = '-mixin'))) then + if isEditable(ident.extractFileExt) and + ((aMessage[i] = '(') or (aMessage[i] = ':') or + ((aMessage[i] = '-') and (i < aMessage.length-5) and (aMessage[i..i+5] = '-mixin'))) then begin // absolute fname if ident.fileExists then