diff --git a/.editorconfig b/.editorconfig --- a/.editorconfig +++ b/.editorconfig @@ -11,5 +11,15 @@ trim_trailing_whitespace = false insert_final_newline = false +[src/parser/__tests__/languageguesser/*] +indent_style = + [Makefile] indent_style = tab + +[externals/**] +; Use editor default (possible autodetection). +indent_style = +indent_size = +trim_trailing_whitespace = false +insert_final_newline = false diff --git a/resources/textmate/local_definition.tmCommand b/resources/textmate/local_definition.tmCommand --- a/resources/textmate/local_definition.tmCommand +++ b/resources/textmate/local_definition.tmCommand @@ -2,10 +2,10 @@ - beforeRunningCommand - nop - command - #!/usr/bin/env php + beforeRunningCommand + nop + command + #!/usr/bin/env php <?php if (getenv('TM_SELECTED_TEXT')) { @@ -62,19 +62,20 @@ exec('/usr/bin/env mate '.escapeshellarg($target).' -l '.escapeshellarg($line)); - fallbackInput - word - input - selection - keyEquivalent - @ - name - Open Definition (PHP, Local Git) - output - showAsTooltip - scope - source.php - uuid - 0D267B50-2E9C-4B48-9D0C-0FB8E9807552 + fallbackInput + word + input + selection + keyEquivalent + @ + + name + Open Definition (PHP, Local Git) + output + showAsTooltip + scope + source.php + uuid + 0D267B50-2E9C-4B48-9D0C-0FB8E9807552 diff --git a/resources/textmate/php_property.tmSnippet b/resources/textmate/php_property.tmSnippet --- a/resources/textmate/php_property.tmSnippet +++ b/resources/textmate/php_property.tmSnippet @@ -2,8 +2,8 @@ - content - ${2:public} function set${1/./\u$0/}(\$${1/[A-Z]+/_\L$0\E/g}) { + content + ${2:public} function set${1/./\u$0/}(\$${1/[A-Z]+/_\L$0\E/g}) { \$this->${1:property} = \$${1/[A-Z]+/_\L$0\E/g}; return \$this; } @@ -13,13 +13,13 @@ } $0 - name - PHP Property - scope - source.php - tabTrigger - prop - uuid - 7C1971CD-6BC0-433B-8604-9F008B6CC29D + name + PHP Property + scope + source.php + tabTrigger + prop + uuid + 7C1971CD-6BC0-433B-8604-9F008B6CC29D diff --git a/resources/textmate/trailing_whitespace.tmMacro b/resources/textmate/trailing_whitespace.tmMacro --- a/resources/textmate/trailing_whitespace.tmMacro +++ b/resources/textmate/trailing_whitespace.tmMacro @@ -2,42 +2,42 @@ - commands - - - argument - - beforeRunningCommand - nop - command - perl -pe 's/[\t ]+$//g' - input - document - output - replaceDocument - - command - executeCommandWithOptions: - - - argument - - beforeRunningCommand - saveActiveFile - input - none - output - discard - - command - executeCommandWithOptions: - - - keyEquivalent - @s - name - Remove Trailing Space and Save - uuid - F61A9B5A-A31E-45C0-8A08-968A50664CC3 + commands + + + argument + + beforeRunningCommand + nop + command + perl -pe 's/[\t ]+$//g' + input + document + output + replaceDocument + + command + executeCommandWithOptions: + + + argument + + beforeRunningCommand + saveActiveFile + input + none + output + discard + + command + executeCommandWithOptions: + + + keyEquivalent + @s + name + Remove Trailing Space and Save + uuid + F61A9B5A-A31E-45C0-8A08-968A50664CC3