From 87a241029a9601d6a58f7fd3f49c5804b855eede Mon Sep 17 00:00:00 2001 From: kapitche <142559040+kapitche@users.noreply.github.com> Date: Wed, 2 Jul 2025 15:06:20 -0400 Subject: [PATCH] Improve label and string handling in asm.tmLanguage.json Added support for local labels and single-quoted strings in the x86 assembly TextMate grammar. Updated label patterns for more accurate highlighting and enhanced string pattern handling to include both double and single quotes. --- package-lock.json | 6 +++--- package.json | 2 +- syntaxes/asm.tmLanguage.json | 33 ++++++++++++++++++++++++--------- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bf03f6..c7ae68e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "x86-assembly-syntax", - "version": "1.0.9", + "version": "1.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "x86-assembly-syntax", - "version": "1.0.9", + "version": "1.2.0", "dependencies": { "axios": "^1.7.7", "cheerio": "^1.0.0" @@ -15,7 +15,7 @@ "vscode": "^1.1.34" }, "engines": { - "vscode": "^1.60.0" + "vscode": "^1.75.0" } }, "node_modules/@tootallnate/once": { diff --git a/package.json b/package.json index 0b81d27..4b21773 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "x86-assembly-syntax", "displayName": "Universal Assembly Syntax Highlighting", "description": "Syntax highlighting extension for x86, x64 and ARM assembly both for Intel and AT&T syntax", - "version": "1.2.0", + "version": "1.2.1", "engines": { "vscode": "^1.75.0" }, diff --git a/syntaxes/asm.tmLanguage.json b/syntaxes/asm.tmLanguage.json index 3d47562..4ac4727 100644 --- a/syntaxes/asm.tmLanguage.json +++ b/syntaxes/asm.tmLanguage.json @@ -124,6 +124,10 @@ }, "labels": { "patterns": [ + { + "name": "entity.name.label.local.x86asm", + "match": "^\\.[a-zA-Z_][a-zA-Z0-9_]*:" + }, { "name": "entity.name.function.label.x86asm", "match": "^[a-zA-Z_][a-zA-Z0-9_]*:" @@ -131,10 +135,6 @@ { "name": "entity.name.tag.label.x86asm", "match": "^L[a-zA-Z0-9_]+:" - }, - { - "name": "entity.name.label.special.x86asm", - "match": "^[._][a-zA-Z_][a-zA-Z0-9_]*:" } ] }, @@ -175,13 +175,28 @@ ] }, "strings": { - "name": "string.quoted.double.x86asm", - "begin": "\"", - "end": "\"", "patterns": [ { - "name": "constant.character.escape.x86asm", - "match": "\\\\." + "name": "string.quoted.double.x86asm", + "begin": "\"", + "end": "\"", + "patterns": [ + { + "name": "constant.character.escape.x86asm", + "match": "\\\\." + } + ] + }, + { + "name": "string.quoted.single.x86asm", + "begin": "'", + "end": "'", + "patterns": [ + { + "name": "constant.character.escape.x86asm", + "match": "\\\\." + } + ] } ] },