Permalink
Browse files

Merge conflicts

  • Loading branch information...
1 parent f7409ff commit f4df3a5f4cebfee6c892a8d2397db6dfe049f3a7 @elpeix elpeix committed Jan 20, 2016
Showing with 0 additions and 95 deletions.
  1. +0 −13 CodeFormatter.sublime-commands
  2. +0 −36 CodeFormatter.sublime-settings
  3. +0 −37 README.md
  4. +0 −9 codeformatter/formatter.py
@@ -45,7 +45,6 @@
"syntax": "python"
}
},
-<<<<<<< HEAD
{
"caption": "CodeFormatter: Format as VBScript Syntax",
"command": "code_formatter",
@@ -63,17 +62,5 @@
"args": {
"syntax": "coldfusion"
}
-=======
- {
- "caption": "CodeFormatter: Format as VBScript Syntax",
- "command": "code_formatter",
- "args": {
- "syntax": "vbscript"
- }
- },
- {
- "caption": "CodeFormatter: Show PHP Transformations",
- "command": "code_formatter_show_php_transformations"
->>>>>>> refs/remotes/akalongman/master
}
]
@@ -1,8 +1,5 @@
{
-<<<<<<< HEAD
-=======
"codeformatter_debug": false,
->>>>>>> refs/remotes/akalongman/master
"codeformatter_php_options":
{
@@ -14,16 +11,6 @@
"psr2": true, // Activate PSR2 style
"indent_with_space": 4, // Use spaces instead of tabs for indentation
"enable_auto_align": true, // Enable auto align of = and =>
-<<<<<<< HEAD
- "visibility_order": true, // Fixes visibiliy order for method in classes - PSR-2 4.2
- "smart_linebreak_after_curly": true, // Convert multistatement blocks into multiline blocks
-
- // Enable specific transnformations. Example: ["ConvertOpenTagWithEcho", "PrettyPrintDocBlocks"]
- // You can list all available transnformations from command palette: CodeFormatter: Show PHP Transformations
- "passes": [],
-
- // Disable specific transnformations
-=======
"visibility_order": true, // Fixes visibility order for method in classes - PSR-2 4.2
"smart_linebreak_after_curly": true, // Convert multistatement blocks into multiline blocks
@@ -32,7 +19,6 @@
"passes": [],
// Disable specific transformations
->>>>>>> refs/remotes/akalongman/master
"exclude": []
},
@@ -51,13 +37,8 @@
"e4x": false, // Pass E4X xml literals through untouched
"jslint_happy": false, // if true, then jslint-stricter mode is enforced. Example function () vs function()
"brace_style": "collapse", // "collapse" | "expand" | "end-expand". put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line.
-<<<<<<< HEAD
- "keep_array_indentation": false, // keep array identation.
- "keep_function_indentation": false, // keep function identation.
-=======
"keep_array_indentation": false, // keep array indentation.
"keep_function_indentation": false, // keep function indentation.
->>>>>>> refs/remotes/akalongman/master
"eval_code": false, // eval code
"unescape_strings": false, // Decode printable characters encoded in xNN notation
"wrap_line_length": 0, // Wrap lines at next opportunity after N characters
@@ -80,19 +61,6 @@
"eol": "\n" // EOL symbol
},
-<<<<<<< HEAD
- "codeformatter_scss_options":
- {
- "syntaxes": "scss", // Indentation size
- "format_on_save": false, // Format on save
- "indent_size": 2, // Indentation size
- "format_on_save": false, // Format on save
- "indent_char": " ", // Indentation character
- "indent_with_tabs": false, // Indent with one tab (overrides indent_size and indent_char options)
- "selector_separator_newline": true, // Add new lines after selector separators
- "end_with_newline": true // Add new line of end in file
- },
-=======
"codeformatter_scss_options":
{
"syntaxes": "scss", // Indentation size
@@ -103,7 +71,6 @@
"selector_separator_newline": true, // Add new lines after selector separators
"end_with_newline": true // Add new line of end in file
},
->>>>>>> refs/remotes/akalongman/master
"codeformatter_html_options":
{
@@ -191,7 +158,6 @@
"middle_tags": "^(Else|ElseIf .* Then|Case .*)$", // List of keywords which divide a block, but neither open or close the block
"closing_tags": "(End Function|End Sub|End If|Next|Loop|End Select)$" // List of keywords which close an open block
},
-<<<<<<< HEAD
"codeformatter_coldfusion_options":
{
@@ -205,8 +171,6 @@
"indent_tags": "html|head|body|div|nav|ul|ol|dl|li|table|thead|tbody|tr|th|td|blockquote|select|form|option|optgroup|fieldset|legend|label|header|section|aside|footer|figure|video|cfapplet|cfapplication|cfassociate|cfauthenticate|cfcache|cfcol|cfcollection|cfcontent|cfdirectory|cferror|cfexecute|cfexit|cffile|cfform|cfftp|cffunction|cfgrid|cfgridcolumn|cfgridrow|cfgridupdate|cfheader|cfhtmlhead|cfhttp|cfif|cfindex|cfinput|cfldap|cflocation|cflock|cfloop|cfmail|cfmodule|cfobject|cfoutput|cfpop|cfprocparam|cfprocresult|cfquery|cfreport|cfrethrow|cfschedule|cfscript|cfsearch|cfselect|cfservlet|cfsetting|cfsilent|cfslider|cfstoredproc|cfswitch|cfcase|cfdefaultcase|cftable|cftextinput|cftransaction|cftree|cftry|cfcatch|cfsavecontent", // List of tags (defaults to indent) that should be reformatted. Example "div|p|li|table"
"middle_tags" : "cfelse|cfelseif"
},
-=======
->>>>>>> refs/remotes/akalongman/master
}
View
@@ -14,10 +14,7 @@ CodeFormatter has support for the following languages:
* SCSS - By Nishutosh Sharma
* Python - By PythonTidy (only ST2)
* Visual Basic/VBScript
-<<<<<<< HEAD
* Coldfusion/Railo/Lucee
-=======
->>>>>>> refs/remotes/akalongman/master
Sponsors
@@ -72,11 +69,7 @@ You must install 5.6 or above (https://github.com/phpfmt/fmt#requirements)
On Linux/OSx after installation of package, you must set chmod +x to file fmt.phar in folder %PACKAGESDIR%/CodeFormatter/codeformatter/lib/phpbeautifier
You can list all available transformations from Command Palette: CodeFormatter: Show PHP Transformations
-<<<<<<< HEAD
-=======
-
Examples of many transformations can be found here: [PHP Transformation Examples](https://github.com/akalongman/sublimetext-codeformatter/blob/master/PHP-Transformations.md)
->>>>>>> refs/remotes/akalongman/master
Language specific options:
```js
@@ -90,19 +83,12 @@ Language specific options:
"psr2": true, // Activate PSR2 style
"indent_with_space": 4, // Use spaces instead of tabs for indentation
"enable_auto_align": true, // Enable auto align of = and =>
-<<<<<<< HEAD
- "visibility_order": true, // Fixes visibiliy order for method in classes - PSR-2 4.2
-=======
"visibility_order": true, // Fixes visibility order for method in classes - PSR-2 4.2
->>>>>>> refs/remotes/akalongman/master
"smart_linebreak_after_curly": true, // Convert multistatement blocks into multiline blocks
// Enable specific transformations. Example: ["ConvertOpenTagWithEcho", "PrettyPrintDocBlocks"]
// You can list all available transformations from command palette: CodeFormatter: Show PHP Transformations
-<<<<<<< HEAD
-=======
// You can also see examples of many transformations at https://github.com/akalongman/sublimetext-codeformatter/blob/master/PHP-Transformations.md
->>>>>>> refs/remotes/akalongman/master
"passes": [],
// Disable specific transformations
@@ -132,13 +118,8 @@ Language specific options:
"e4x": false, // Pass E4X xml literals through untouched
"jslint_happy": false, // if true, then jslint-stricter mode is enforced. Example function () vs function()
"brace_style": "collapse", // "collapse" | "expand" | "end-expand". put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line.
-<<<<<<< HEAD
- "keep_array_indentation": false, // keep array identation.
- "keep_function_indentation": false, // keep function identation.
-=======
"keep_array_indentation": false, // keep array indentation.
"keep_function_indentation": false, // keep function indentation.
->>>>>>> refs/remotes/akalongman/master
"eval_code": false, // eval code
"unescape_strings": false, // Decode printable characters encoded in xNN notation
"wrap_line_length": 0, // Wrap lines at next opportunity after N characters
@@ -268,7 +249,6 @@ Language specific options:
```
### Visual Basic/VBScript
Visual Basic/VBScript - used custom approach using the HTML beautifier as a guide
-<<<<<<< HEAD
Language specific options:
```js
@@ -302,23 +282,6 @@ Language specific options:
"max_preserve_newlines": 10, // Maximum number of line-breaks to be preserved in one chunk
"indent_tags": "html|head|body|div|nav|ul|ol|dl|li|table|thead|tbody|tr|th|td|blockquote|select|form|option|optgroup|fieldset|legend|label|header|section|aside|footer|figure|video|cfapplet|cfapplication|cfassociate|cfauthenticate|cfcache|cfcol|cfcollection|cfcontent|cfdirectory|cferror|cfexecute|cfexit|cffile|cfform|cfftp|cffunction|cfgrid|cfgridcolumn|cfgridrow|cfgridupdate|cfheader|cfhtmlhead|cfhttp|cfif|cfindex|cfinput|cfldap|cflocation|cflock|cfloop|cfmail|cfmodule|cfobject|cfoutput|cfpop|cfprocparam|cfprocresult|cfquery|cfreport|cfrethrow|cfschedule|cfscript|cfsearch|cfselect|cfservlet|cfsetting|cfsilent|cfslider|cfstoredproc|cfswitch|cfcase|cfdefaultcase|cftable|cftextinput|cftransaction|cftree|cftry|cfcatch|cfsavecontent", // List of tags (defaults to indent) that should be reformatted. Example "div|p|li|table"
"middle_tags" : "cfelse|cfelseif"
-=======
-
-Language specific options:
-```js
- "codeformatter_vbscript_options":
- {
- "syntaxes": "vbscript", // Syntax names which must process VBScript formatter
- "format_on_save": false, // Format on save
- "indent_size": 1, // indentation size
- "indent_char": "\t", // Indentation character
- "indent_with_tabs": true, // Indent with one tab (overrides indent_size and indent_char options)
- "preserve_newlines": true, // Preserve existing line-breaks
- "max_preserve_newlines": 10, // Maximum number of line-breaks to be preserved in one chunk
- "opening_tags": "^(Function .*|Sub .*|If .* Then|For .*|Do While .*|Select Case.*)", // List of keywords which open a new block
- "middle_tags": "^(Else|ElseIf .* Then|Case .*)$", // List of keywords which divide a block, but neither open or close the block
- "closing_tags": "(End Function|End Sub|End If|Next|Loop|End Select)$" // List of keywords which close an open block
->>>>>>> refs/remotes/akalongman/master
}
```
@@ -20,10 +20,7 @@
from .scssformatter import ScssFormatter
from .pyformatter import PyFormatter
from .vbscriptformatter import VbscriptFormatter
-<<<<<<< HEAD
from .coldfusionformatter import ColdfusionFormatter
-=======
->>>>>>> refs/remotes/akalongman/master
except (ValueError):
# Python 2
@@ -34,10 +31,7 @@
from scssformatter import ScssFormatter
from pyformatter import PyFormatter
from vbscriptformatter import VbscriptFormatter
-<<<<<<< HEAD
from coldfusionformatter import ColdfusionFormatter
-=======
->>>>>>> refs/remotes/akalongman/master
class Formatter:
@@ -102,15 +96,12 @@ def __init__(self, view=False, file_name=False, syntax=False, saving=False):
for _formatter in opts["syntaxes"].split(","):
self.classmap[_formatter.strip()] = PyFormatter
-<<<<<<< HEAD
# COLDFUSION
opts = self.settings.get('codeformatter_coldfusion_options')
if ("syntaxes" in opts and opts["syntaxes"]):
for _formatter in opts["syntaxes"].split(","):
self.classmap[_formatter.strip()] = ColdfusionFormatter
-=======
->>>>>>> refs/remotes/akalongman/master

0 comments on commit f4df3a5

Please sign in to comment.