Added support for base64 and URLs in LDIF, removed specific snippets …

…so the bundle can be released to the public git-svn-id: file:///usr/local/svn/LDIF.tmbundle@6 8ef85cf1-b19b-4aa0-b1c0-21308e7681cd
skurfer · Dec 10, 2008 · 2dba1ec · 2dba1ec
1 parent c7d3da9
commit 2dba1ec
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 65 deletions.
diff --git a/Commands/Generate UID Number.tmCommand b/Commands/Generate UID Number.tmCommand
diff --git a/Preferences/Symbols.tmPreferences b/Preferences/Symbols.tmPreferences
@@ -5,13 +5,15 @@
 	<key>name</key>
 	<string>Symbols</string>
 	<key>scope</key>
-	<string>support.distinguishedName.ldif</string>
+	<string>entity.distinguishedName.ldif</string>
 	<key>settings</key>
 	<dict>
 		<key>showInSymbolList</key>
 		<integer>1</integer>
 		<key>symbolTransformation</key>
-		<string>s/^dn: (.*)$/$1/</string>
+		<string>
+		s/^r?dn: (.*)$/$1/;
+	</string>
 	</dict>
 	<key>uuid</key>
 	<string>DE4D9A5C-3A76-452D-ADF0-E33B43EEA1DC</string>

diff --git a/Snippets/New User.tmSnippet b/Snippets/New User.tmSnippet
diff --git a/Syntaxes/LDIF.tmLanguage b/Syntaxes/LDIF.tmLanguage
@@ -7,7 +7,7 @@
 		<string>ldif</string>
 	</array>
 	<key>foldingStartMarker</key>
-	<string>^dn:</string>
+	<string>^r?dn:</string>
 	<key>foldingStopMarker</key>
 	<string>^$</string>
 	<key>keyEquivalent</key>
@@ -18,19 +18,19 @@
 	<array>
 		<dict>
 			<key>match</key>
-			<string>^dn:.*$</string>
+			<string>^r?dn:.*$</string>
 			<key>name</key>
-			<string>support.distinguishedName.ldif</string>
+			<string>entity.distinguishedName.ldif</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>^(?=[^#])\S+:</string>
+			<string>^(?=[^#])\w+:[:&lt;]?</string>
 			<key>name</key>
 			<string>keyword.attribute.ldif</string>
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;=:\s)</string>
+			<string>(?&lt;=\w:\s)</string>
 			<key>end</key>
 			<string>(?=^[\S\n])</string>
 			<key>name</key>
@@ -45,12 +45,52 @@
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;=\w::\s)</string>
+			<key>end</key>
+			<string>(?=^[\S\n])</string>
+			<key>name</key>
+			<string>storage.value.base64.ldif</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\s+(?=\n)</string>
+					<key>name</key>
+					<string>invalid.illegal</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;=:&lt;\s)</string>
+			<key>end</key>
+			<string>(?=^[\S\n])</string>
+			<key>name</key>
+			<string>markup.underline.link.ldif</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\s+(?=\n)</string>
+					<key>name</key>
+					<string>invalid.illegal</string>
+				</dict>
+			</array>
+		</dict>
 		<dict>
 			<key>match</key>
 			<string>(#).*$\n?</string>
 			<key>name</key>
 			<string>comment.line.number-sign.ldif</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>^-$\n?</string>
+			<key>name</key>
+			<string>support.separator.ldif</string>
+		</dict>
 	</array>
 	<key>scopeName</key>
 	<string>text.ldif</string>

diff --git a/info.plist b/info.plist
@@ -2,16 +2,20 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>contactEmailRot13</key>
+	<string>ebo@fxhesre.pbz</string>
+	<key>contactName</key>
+	<string>Rob McBroom</string>
+	<key>description</key>
+	<string>This bundle supports the LDAP Data Interchange Format and other LDAP related tasks.</string>
 	<key>name</key>
 	<string>LDAP</string>
 	<key>ordering</key>
 	<array>
 		<string>D8D20662-03C0-4303-A431-EB2427D97F0F</string>
 		<string>DE4D9A5C-3A76-452D-ADF0-E33B43EEA1DC</string>
 		<string>4B28B743-9B44-4144-BFB1-2F67A9DD1297</string>
-		<string>15252767-ACE3-44F1-9012-C88F959D6680</string>
 		<string>185C7481-A2E0-439C-A7E2-226CD4D60969</string>
-		<string>F05C9840-8490-48FF-9CF3-1A18879C904A</string>
 	</array>
 	<key>uuid</key>
 	<string>C473C122-592E-4943-9CB0-44F02C24F780</string>