diff --git a/Commands/Generate UID Number.tmCommand b/Commands/Generate UID Number.tmCommand
deleted file mode 100644
index fdfdef1..0000000
--- a/Commands/Generate UID Number.tmCommand
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- beforeRunningCommand
- nop
- command
- #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
- input
- none
- name
- Generate UID Number
- output
- replaceSelectedText
- uuid
- F05C9840-8490-48FF-9CF3-1A18879C904A
-
-
diff --git a/Preferences/Symbols.tmPreferences b/Preferences/Symbols.tmPreferences
index 3c4489f..e5e6cdf 100644
--- a/Preferences/Symbols.tmPreferences
+++ b/Preferences/Symbols.tmPreferences
@@ -5,13 +5,15 @@
name
Symbols
scope
- support.distinguishedName.ldif
+ entity.distinguishedName.ldif
settings
showInSymbolList
1
symbolTransformation
- s/^dn: (.*)$/$1/
+
+ s/^r?dn: (.*)$/$1/;
+
uuid
DE4D9A5C-3A76-452D-ADF0-E33B43EEA1DC
diff --git a/Snippets/New User.tmSnippet b/Snippets/New User.tmSnippet
deleted file mode 100644
index 6554eb4..0000000
--- a/Snippets/New User.tmSnippet
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- content
- dn: uid=$5,ou=users,dc=${1:adesa},dc=${2:com}
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: adesaPerson
-objectClass: posixAccount
-objectClass: shadowAccount
-givenName: ${3:First}
-sn: ${4:Last}
-uid: ${5:${3/^.*?(\w).*$/\L$1/}${4/^.*?(\S+).*$/\L$1/}}
-cn: $3 $4
-displayName: $3 $4
-uidNumber: ${6:`/Users/rob/Coding/minfo/nextuid`}
-gidNumber: $6
-mail: ${3/^.*?(\S+).*$/\L$1/}.${4/^.*?(\S+).*$/\L$1/}@$1.$2
-homeDirectory: /home/$5
-loginShell: /bin/${7:bash}
-shadowLastChange: 0
-#shadowMax: 90
-userPassword: ${8:[type password then hit CTRL-P]}
-#sshPublicKey:
-$0
- name
- New User
- scope
- text.ldif
- tabTrigger
- user
- uuid
- 15252767-ACE3-44F1-9012-C88F959D6680
-
-
diff --git a/Syntaxes/LDIF.tmLanguage b/Syntaxes/LDIF.tmLanguage
index 34133d5..36ecf6d 100644
--- a/Syntaxes/LDIF.tmLanguage
+++ b/Syntaxes/LDIF.tmLanguage
@@ -7,7 +7,7 @@
ldif
foldingStartMarker
- ^dn:
+ ^r?dn:
foldingStopMarker
^$
keyEquivalent
@@ -18,19 +18,19 @@
match
- ^dn:.*$
+ ^r?dn:.*$
name
- support.distinguishedName.ldif
+ entity.distinguishedName.ldif
match
- ^(?=[^#])\S+:
+ ^(?=[^#])\w+:[:<]?
name
keyword.attribute.ldif
begin
- (?<=:\s)
+ (?<=\w:\s)
end
(?=^[\S\n])
name
@@ -45,12 +45,52 @@
+
+ begin
+ (?<=\w::\s)
+ end
+ (?=^[\S\n])
+ name
+ storage.value.base64.ldif
+ patterns
+
+
+ match
+ \s+(?=\n)
+ name
+ invalid.illegal
+
+
+
+
+ begin
+ (?<=:<\s)
+ end
+ (?=^[\S\n])
+ name
+ markup.underline.link.ldif
+ patterns
+
+
+ match
+ \s+(?=\n)
+ name
+ invalid.illegal
+
+
+
match
(#).*$\n?
name
comment.line.number-sign.ldif
+
+ match
+ ^-$\n?
+ name
+ support.separator.ldif
+
scopeName
text.ldif
diff --git a/info.plist b/info.plist
index 4961b54..3b37fc4 100644
--- a/info.plist
+++ b/info.plist
@@ -2,6 +2,12 @@
+ contactEmailRot13
+ ebo@fxhesre.pbz
+ contactName
+ Rob McBroom
+ description
+ This bundle supports the LDAP Data Interchange Format and other LDAP related tasks.
name
LDAP
ordering
@@ -9,9 +15,7 @@
D8D20662-03C0-4303-A431-EB2427D97F0F
DE4D9A5C-3A76-452D-ADF0-E33B43EEA1DC
4B28B743-9B44-4144-BFB1-2F67A9DD1297
- 15252767-ACE3-44F1-9012-C88F959D6680
185C7481-A2E0-439C-A7E2-226CD4D60969
- F05C9840-8490-48FF-9CF3-1A18879C904A
uuid
C473C122-592E-4943-9CB0-44F02C24F780