Skip to content

Commit 888801c

Browse files
committed
Fix syntax highlighting in cases like dword[gs:20]
1 parent 2fe3624 commit 888801c

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

fasm.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,11 @@ void FASM::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlightin
327327
highlightingRules.append(rule);
328328
}
329329

330+
//labels
331+
rule.pattern = QRegExp("\\S+:");
332+
rule.format = labelFormat;
333+
highlightingRules.append(rule);
334+
330335
//memory
331336
rule.format = memoryFormat;
332337
QStringList memoryPatterns;
@@ -354,11 +359,6 @@ void FASM::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlightin
354359
highlightingRules.append(rule);
355360
}
356361

357-
//labels
358-
rule.pattern = QRegExp("\\S+:");
359-
rule.format = labelFormat;
360-
highlightingRules.append(rule);
361-
362362
//numbers
363363
rule.format = numberFormat;
364364
rule.pattern = QRegExp("\\b[\\-\\+]?\\d+[bod]?\\b");

gas.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,11 @@ void GAS::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlighting
346346
highlightingRules.append(rule);
347347
}
348348

349+
//labels
350+
rule.pattern = QRegExp("\\S+:");
351+
rule.format = labelFormat;
352+
highlightingRules.append(rule);
353+
349354
//memory
350355
rule.format = memoryFormat;
351356
QStringList memoryPatterns;
@@ -356,11 +361,6 @@ void GAS::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlighting
356361
highlightingRules.append(rule);
357362
}
358363

359-
//labels
360-
rule.pattern = QRegExp("\\S+:");
361-
rule.format = labelFormat;
362-
highlightingRules.append(rule);
363-
364364
//numbers
365365
rule.format = numberFormat;
366366
rule.pattern = QRegExp("\\b[\\-\\+]?\\d+[bod]?\\b");

masm.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,11 @@ void MASM::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlightin
400400
highlightingRules.append(rule);
401401
}
402402

403+
//! Labels
404+
rule.pattern = QRegExp("\\S+:");
405+
rule.format = labelFormat;
406+
highlightingRules.append(rule);
407+
403408
//! Memory
404409
rule.format = memoryFormat;
405410
QStringList memoryPatterns;
@@ -428,11 +433,6 @@ void MASM::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlightin
428433
highlightingRules.append(rule);
429434
}
430435

431-
//! Labels
432-
rule.pattern = QRegExp("\\S+:");
433-
rule.format = labelFormat;
434-
highlightingRules.append(rule);
435-
436436
//! Numbers
437437
rule.format = numberFormat;
438438
rule.pattern = QRegExp("\\b[\\-\\+]?\\d+[bod]?\\b");

nasm.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,11 @@ void NASM::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlightin
353353
highlightingRules.append(rule);
354354
}
355355

356+
//! Labels
357+
rule.pattern = QRegExp("\\S+:");
358+
rule.format = labelFormat;
359+
highlightingRules.append(rule);
360+
356361
//! Memory
357362
rule.format = memoryFormat;
358363
QStringList memoryPatterns;
@@ -377,11 +382,6 @@ void NASM::fillHighligherRules(QVector<Assembler::HighlightingRule> &highlightin
377382
highlightingRules.append(rule);
378383
}
379384

380-
//! Labels
381-
rule.pattern = QRegExp("\\S+:");
382-
rule.format = labelFormat;
383-
highlightingRules.append(rule);
384-
385385
//! Numbers
386386
rule.format = numberFormat;
387387
rule.pattern = QRegExp("\\b[\\-\\+]?\\d+[bod]?\\b");

0 commit comments

Comments
 (0)