|
76 | 76 | }; |
77 | 77 |
|
78 | 78 | netStack.prototype.replacer = function(args, at_language) { |
79 | | - if (args[0].substr(0).match(/(-{3})/)) { |
| 79 | + if (args[0].substring(0).match(/(-{3}>)/)) { |
| 80 | + return '\r\n ' + args[0]; |
| 81 | + } else if (args[0].substring(0).match(/(-{3})/)) { |
80 | 82 | return '\r\n ' + args[0]; |
81 | 83 | } else { |
82 | 84 | return '\r\n ' + at_language + ' ' + args[2] + '(' + args[3] + ')'; |
|
86 | 88 | netStack.prototype.formatException = function(exceptionMessage, at_language) { |
87 | 89 | var result = exceptionMessage || ''; |
88 | 90 | var searchReplaces = [ |
| 91 | + { |
| 92 | + find: new RegExp('(-{3}>\\s)(.*?)(?=\\s-{3}|(\\s)+' + at_language + ')', 'g'), |
| 93 | + repl: null |
| 94 | + }, |
89 | 95 | { |
90 | 96 | find: /(-{3}\s)(.*?)(-{3})/gm, |
91 | 97 | repl: null |
|
158 | 164 | var regFrame = new RegExp('(\\S*)' + selectedLanguage.at + ' .*?\\)'), |
159 | 165 | partsFrame = String(regFrame.exec(lines[i])); |
160 | 166 |
|
161 | | - if (partsFrame.substr(partsFrame.length - 1) == ',') { |
| 167 | + if (partsFrame.substring(partsFrame.length - 1) == ',') { |
162 | 168 | partsFrame = partsFrame.slice(0, -1); |
163 | 169 | } |
164 | 170 |
|
|
198 | 204 | var newPartsFrame = partsFrame.replace(partsParamList, stringParam).replace(partsTypeMethod, stringTypeMethod); |
199 | 205 |
|
200 | 206 | // Line |
201 | | - var regLine = new RegExp('\\b:' + selectedLanguage.line + '.*'), |
| 207 | + var regLine = new RegExp('\\b:' + selectedLanguage.line + ' \\d+'), |
202 | 208 | partsLine = String(regLine.exec(lines[i])); |
| 209 | + |
203 | 210 | partsLine = partsLine.replace(':', '').trim(); |
204 | 211 |
|
205 | 212 | var fileLi = li.replace(selectedLanguage.at + " " + partsFrame, '').trim(); |
|
208 | 215 | var regFile = new RegExp(selectedLanguage.in + '\\s.*$', 'm'), |
209 | 216 | partsFile = String(regFile.exec(fileLi)); |
210 | 217 |
|
211 | | - partsFile = partsFile.replace(selectedLanguage.in + ' ', '').replace(':' + partsLine, ''); |
| 218 | + partsFile = partsFile.replace(selectedLanguage.in + ' ', '').replace(':' + partsLine, '').replace('<---', ''); |
212 | 219 |
|
213 | 220 | li = li.replace(partsFrame, '<span class="' + this.settings.frame + '">' + newPartsFrame + '</span>') |
214 | 221 | .replace(partsFile, '<span class="' + this.settings.file + '">' + partsFile + '</span>') |
|
0 commit comments