From e9438a40bb36ce0749f3a2412577225ee41795fe Mon Sep 17 00:00:00 2001
From: John Mumm <jtfmumm@gmail.com>
Date: Wed, 16 Oct 2013 12:50:34 -0400
Subject: [PATCH] Added comment shortcut

---
 6502asm.JSON-tmLanguage      |   7 ++++++-
 6502asm.tmLanguage           |  10 +++++++++-
 6502asm.tmLanguage.cache     | Bin 0 -> 720 bytes
 Comments.tmPreferences       |  28 ++++++++++++++++++++++++++++
 Comments.tmPreferences.cache | Bin 0 -> 273 bytes
 package-metadata.json        |   2 +-
 6 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 6502asm.tmLanguage.cache
 create mode 100644 Comments.tmPreferences
 create mode 100644 Comments.tmPreferences.cache

diff --git a/6502asm.JSON-tmLanguage b/6502asm.JSON-tmLanguage
index d04aa54..52ea3f5 100644
--- a/6502asm.JSON-tmLanguage
+++ b/6502asm.JSON-tmLanguage
@@ -40,6 +40,11 @@
             "comment": "Comment"
         },
 
+        {
+            "match": "(\/\/|;)(\\s|\\S)*",
+            "name": "comment.punctuation.definition.asm",
+            "comment": "Comment"
+        },
 
         {
             "match": "(?i)\\b([\\w|\\d]*)\\:",
@@ -78,7 +83,7 @@
         },
 
         {
-            "match": "(?i)\\#([0-9]+)\\b",
+            "match": "(?i)\\#([0-9a-f$%]+)\\b",
             "name": "constant.numeric.asm",
             "comment": "Decimal number"
         }
diff --git a/6502asm.tmLanguage b/6502asm.tmLanguage
index 69a9f5b..2a7718a 100644
--- a/6502asm.tmLanguage
+++ b/6502asm.tmLanguage
@@ -58,6 +58,14 @@
 			<key>name</key>
 			<string>comment.line.asm</string>
 		</dict>
+		<dict>
+			<key>comment</key>
+			<string>Comment</string>
+			<key>match</key>
+			<string>(//|;)(\s|\S)*</string>
+			<key>name</key>
+			<string>comment.punctuation.definition.asm</string>
+		</dict>
 		<dict>
 			<key>comment</key>
 			<string>Jump label</string>
@@ -110,7 +118,7 @@
 			<key>comment</key>
 			<string>Decimal number</string>
 			<key>match</key>
-			<string>(?i)\#([0-9]+)\b</string>
+			<string>(?i)\#([0-9a-f$%]+)\b</string>
 			<key>name</key>
 			<string>constant.numeric.asm</string>
 		</dict>
diff --git a/6502asm.tmLanguage.cache b/6502asm.tmLanguage.cache
new file mode 100644
index 0000000000000000000000000000000000000000..96368d72345894e2cf54824b1962d5c4e1afb318
GIT binary patch
literal 720
zcmV;>0x$i)L;R<L2LJ$goUN4aPt!mc$5B+&M1z1ocvo>qhpddT5zrR~MWV*|1`}V<
znOv_|c6hzkyX$C^=a2WfI<{qPLQr3P()HGUKi})McXMuT?ly7@ktAmGc)W}3_1YbW
z==dJ~j<{goij?Uacw(6!f&bh4vW$oJw1ITO&OyjJ-Bvs5wp-o(Uav*E?fuqX#P);T
zcCWY7+qIdRCMo+m65h81Nv0_CFw*K%VhmHVG(JRbj*QbapCCV3agnIdBZ`}WNX|I5
z33fs;F?3)r`+&G_dD9PE5>g;C1fm6mj3PNw0812bNs$~WKxhStBA^n1D9{1L+ZQm1
zCUMN9vANHYL#vIM;ncxgr!3%bsg260;fd6By_cqX2Z~5KsB}J<bPgzmfNBWXF9>1|
zfn*S*0)ioq4>g>}DV$?pWjLa%J(rPprRK_J%TvuTAtj1cs;y2{;|3_|X__NNRs9rs
zU*>R~$ZP2%LC!QY75(}|PXz@kLWCnj(72+Sg$S=!v9*se)4@=~<=K^GR;J1re0(}$
zs?z4uq>Ts(h%iSANCyN-Ar*KODQH8G94Ww%9KoZ;V@?narXbbEFOe?^3AY?=62-R4
zH|(;>mGu`VVV>Z!x{mg%a<{kPP1E%?_$STH8UMnc#j~e%g0(3@nn`LhV#|0Ti@4<F
z&;PA_WVeYdO%r82Du~t<!_s6uPW=n;!~SN|e?4QdyUph;P8~r4ChA1b5WJY1!m~qO
zWan2mqp{DM^35)!^&N4=Fk;AR7pvU=jKbHlVz6^|e}J!>YiRJb|GmGtHY2!$oRqg;
zGkkR%?r)6K{SCKahpr`ADKEx%lHltgvzV!xo%r$P(`vY`AHwNj>$u;1RsX;~vfRO(
zfT_RMEne!@-P1Pg^lMBH?B2*FQN_Q?#&dgtvep4<MUC}3qx}Ys809e$Bjs;rMBD0@
Cac`Rd

literal 0
HcmV?d00001

diff --git a/Comments.tmPreferences b/Comments.tmPreferences
new file mode 100644
index 0000000..9a956aa
--- /dev/null
+++ b/Comments.tmPreferences
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Comments</string>
+	<key>scope</key>
+	<string>source.asm</string>
+	<key>settings</key>
+	<dict>
+		<key>decreaseIndentPattern</key>
+		<string>^\s*((end|else|elseif)\b)</string>
+		<key>increaseIndentPattern</key>
+		<string>^\s*(if|while|for|begin|function|macro|module|type|let|else|elseif)\b.*\s*$</string>
+		<key>shellVariables</key>
+		<array>
+			<dict>
+				<key>name</key>
+				<string>TM_COMMENT_START</string>
+				<key>value</key>
+				<string>; </string>
+			</dict>
+		</array>
+	</dict>
+	<key>uuid</key>
+	<string>2d29de24-0f40-4855-a408-6fe8b3055153</string>
+</dict>
+</plist>
diff --git a/Comments.tmPreferences.cache b/Comments.tmPreferences.cache
new file mode 100644
index 0000000000000000000000000000000000000000..63918ede1f7e468e25c21ea17f52bf9e5054cf13
GIT binary patch
literal 273
zcmV+s0q*|4L;R<H0RRAaoOO@SOT#b}$7@v(58}mxHxD~(gO1v@Qt>3igGg1hcp8qh
zdD#N_G4ewZ^2hs9CWzqSle~Pt@B5OZNs=7w@Sf9s+($@3i)#u+ndPj^v$C$LjFfqu
zT`{P;d0thQ)jVbtkq|RS$U;jA%Gp?3aE`0BO|g#t8A72qKrGxVifzxtIWQ`k=g9lg
zPRC<VG=Q)$ESyc2-6STt`X~ADljJOXZn%KJv<V%oxeCmy-f^vhB)!o=YU<H<Ut0(Q
z+@EV^Q=Bq7i7(%P5O2hA(h0D8s6^5ozyExSw9RVq)HHXG?dr9?eQ6I-`yj#(4KZ+Y
X5hdH}?I0b;gZ8F}8L{#k#^PY;`O1se

literal 0
HcmV?d00001

diff --git a/package-metadata.json b/package-metadata.json
index b85d822..f36e969 100644
--- a/package-metadata.json
+++ b/package-metadata.json
@@ -1 +1 @@
-{"url": "https://github.com/jtfmumm/6502asm-sublime", "version": "0.1", "description": "6502 asm syntax definition for Sublime Text 2"}
+{"url": "https://github.com/jtfmumm/6502asm-sublime", "version": "2013.10.11.16.09.52", "description": "A 6502 asm syntax definition for Sublime Text 2."}
\ No newline at end of file