diff --git a/Preferences/Indent.tmPreferences b/Preferences/Indent.tmPreferences
index 53e9e40..efe02e1 100644
--- a/Preferences/Indent.tmPreferences
+++ b/Preferences/Indent.tmPreferences
@@ -13,7 +13,7 @@
increaseIndentPattern
(?x)^
(\s*
- (module|object|def
+ (module|def
|unless|if|else|elsif
|case|match|receive
|begin|rescue|after
diff --git a/Snippets/object ___ end.tmSnippet b/Snippets/object ___ end.tmSnippet
deleted file mode 100644
index bfaf02f..0000000
--- a/Snippets/object ___ end.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- content
- object ${1:ObjectName}
- $0
-end
- name
- object ... end
- scope
- source.elixir
- tabTrigger
- object
- uuid
- 6F931265-3CAA-4AAC-8A11-B49F8807E6D1
-
-
diff --git a/Syntaxes/Elixir.tmLanguage b/Syntaxes/Elixir.tmLanguage
index fe87eab..dead73d 100644
--- a/Syntaxes/Elixir.tmLanguage
+++ b/Syntaxes/Elixir.tmLanguage
@@ -15,7 +15,7 @@ This bundle was based on the Ruby bundle by James Edward Gray II and there is a
foldingStartMarker
(?x)^
(\s*+
- (module|object|def(?!.*\bend\s*$)
+ (module|def(?!.*\bend\s*$)
|unless|if
|case|receive|when
|try
@@ -54,45 +54,6 @@ This bundle was based on the Ruby bundle by James Edward Gray II and there is a
Elixir
patterns
-
- captures
-
- 1
-
- name
- keyword.control.object.elixir
-
- 2
-
- name
- entity.name.type.object.elixir
-
- 4
-
- name
- entity.other.inherited-object.elixir
-
- 5
-
- name
- punctuation.separator.inheritance.elixir
-
- 6
-
- name
- variable.other.object.elixir
-
- 7
-
- name
- punctuation.definition.variable.elixir
-
-
- match
- ^\s*(object)\s+(([.a-zA-Z0-9_:]+(\s*(<)\s*[.a-zA-Z0-9_:]+)?)|((<<)\s*[.a-zA-Z0-9_:]+))
- name
- meta.object.elixir
-
captures
@@ -154,7 +115,7 @@ This bundle was based on the Ruby bundle by James Edward Gray II and there is a
comment
everything being a reserved word, not a value and needing a 'end' is a..
match
- (?<!\.)\b(begin|case|receive|object|else|elsif|END|end|after|for|if|in|module|try|catch|then|unless|when|match)\b(?![?!])
+ (?<!\.)\b(begin|case|receive|else|elsif|END|end|after|for|if|in|module|try|catch|then|unless|when|match)\b(?![?!])
name
keyword.control.elixir
@@ -206,7 +167,7 @@ This bundle was based on the Ruby bundle by James Edward Gray II and there is a
comment
everything being a method but having a special function is a..
match
- \b(initialize|new|loop|include|extend|raise|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|module_function|public|protected|callbacks)\b(?![?!])
+ \b(initialize|loop|mixin|attr_reader|attr_writer|attr_accessor|catch|error|throw|exit|private|public|protected)\b(?![?!])
name
keyword.other.special-method.elixir
diff --git a/info.plist b/info.plist
index 61a1215..e260867 100644
--- a/info.plist
+++ b/info.plist
@@ -12,7 +12,6 @@
868014EE-AC0F-48B6-AFCC-E4DA446E58C2
B7C61ED5-9215-4CF1-87BF-BBA4A656D41E
C7985E66-F271-48BD-A5A8-B4A7DA732593
- 6F931265-3CAA-4AAC-8A11-B49F8807E6D1
6CE083B3-2738-49C3-8B50-D7B27F759B10
0F4CBF04-F2F9-4B2C-B74A-E2F44AA7D6CF
9AE4B114-2F98-4FAC-9F3B-EFB6004B1422