Merge branch 'master' into patch-1
This commit is contained in:
		
						commit
						1e445dc4df
					
				
					 8 changed files with 30 additions and 21 deletions
				
			
		
							
								
								
									
										4
									
								
								.vscode/settings.json
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.vscode/settings.json
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -3,7 +3,9 @@
 | 
			
		|||
	"files.exclude": {
 | 
			
		||||
		"**/.git": true,
 | 
			
		||||
		"**/.DS_Store": true,
 | 
			
		||||
		"**/*/vsix": true,
 | 
			
		||||
		"**/*.vsix": true,
 | 
			
		||||
		"**/*.js": {"when": "$(basename).ts"}
 | 
			
		||||
	}
 | 
			
		||||
,
 | 
			
		||||
"typescript.tsdk": "./node_modules/typescript/lib"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								CHANGELOG.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								CHANGELOG.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases).
 | 
			
		||||
| 
						 | 
				
			
			@ -3,7 +3,11 @@ Thanks for helping out! This guide provides some guidelines on coding styles and
 | 
			
		|||
Keep in mind that these are guidelines, not rules. Use your best judgement and feel free to make suggestions!
 | 
			
		||||
 | 
			
		||||
## Workflow
 | 
			
		||||
**Please read the [TrueCommerce organization's workflow documentation](https://github.com/TrueCommerce/Meta/wiki/workflow#truecommerce-workflow) before getting started.**
 | 
			
		||||
Please use the follow general workflow when making contributions to the code:
 | 
			
		||||
 | 
			
		||||
1. Fork the repository.
 | 
			
		||||
2. Create a feature branch or commit directly to the `develop` branch.
 | 
			
		||||
3. Create a pull request to request that your commits be merged to the `develop` branch of the `vscode-xml` repository. PRs submitted to the `master` branch will not be considered.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## Building the Extension
 | 
			
		||||
| 
						 | 
				
			
			@ -11,8 +15,6 @@ Keep in mind that these are guidelines, not rules. Use your best judgement and f
 | 
			
		|||
2. Run the `build` task in VS Code (`CTRL + SHIFT + B`) or start extension debugging (`F5`), which will run the `build` task for you.
 | 
			
		||||
 | 
			
		||||
## Style Guide
 | 
			
		||||
In short, favor clean, maintainable code over code that "just works".
 | 
			
		||||
 | 
			
		||||
### Imports
 | 
			
		||||
To keep *.ts files from getting too cluttered, use a namespace alias when pulling in more than 4 or 5 objects. As a general rule, always import the `vscode` namespace using the `vsc` alias for consistency.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								LICENSE
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
The MIT License (MIT)
 | 
			
		||||
 | 
			
		||||
Copyright (c) 2015 TrueCommerce, Inc.
 | 
			
		||||
Copyright (c) 2015 Josh Johnson
 | 
			
		||||
 | 
			
		||||
Permission is hereby granted, free of charge, to any person obtaining a copy
 | 
			
		||||
of this software and associated documentation files (the "Software"), to deal
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										22
									
								
								README.md
									
										
									
									
									
								
							
							
						
						
									
										22
									
								
								README.md
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,16 +1,20 @@
 | 
			
		|||
# XML Tools for Visual Studio Code
 | 
			
		||||
[](https://travis-ci.org/TrueCommerce/vscode-xml)
 | 
			
		||||
[](https://gitter.im/vscode-xml/vscode-xml)
 | 
			
		||||
[](https://travis-ci.org/DotJoshJohnson/vscode-xml)
 | 
			
		||||
 | 
			
		||||
## Features
 | 
			
		||||
* [XML Formatting](https://github.com/TrueCommerce/vscode-xml/wiki/xml-formatting)
 | 
			
		||||
* [XML Tree View](https://github.com/TrueCommerce/vscode-xml/wiki/xml-tree-view)
 | 
			
		||||
* [XPath Evaluation](https://github.com/TrueCommerce/vscode-xml/wiki/xpath-evaluation)
 | 
			
		||||
* [XQuery Linting](https://github.com/TrueCommerce/vscode-xml/wiki/xquery-linting)
 | 
			
		||||
* [XQuery Execution](https://github.com/TrueCommerce/vscode-xml/wiki/xquery-script-execution)
 | 
			
		||||
* [XQuery Code Completion](https://github.com/TrueCommerce/vscode-xml/wiki/xquery-code-completion)
 | 
			
		||||
* [XML Formatting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-formatting)
 | 
			
		||||
* [XML Tree View](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-tree-view)
 | 
			
		||||
* [XPath Evaluation](https://github.com/DotJoshJohnson/vscode-xml/wiki/xpath-evaluation)
 | 
			
		||||
* [XQuery Linting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-linting)
 | 
			
		||||
* [XQuery Execution](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-script-execution)
 | 
			
		||||
* [XQuery Code Completion](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-code-completion)
 | 
			
		||||
 | 
			
		||||
## Release Notes
 | 
			
		||||
Detailed release notes are available [here](https://github.com/TrueCommerce/vscode-xml/releases).
 | 
			
		||||
Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases).
 | 
			
		||||
 | 
			
		||||
## Issues
 | 
			
		||||
Run into a bug? Report it [here](https://github.com/TrueCommerce/vscode-xml/issues).
 | 
			
		||||
Run into a bug? Report it [here](https://github.com/DotJoshJohnson/vscode-xml/issues).
 | 
			
		||||
 | 
			
		||||
## Roadmap
 | 
			
		||||
Check out development progress [here](https://github.com/DotJoshJohnson/vscode-xml/projects/1).
 | 
			
		||||
							
								
								
									
										14
									
								
								package.json
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								package.json
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -2,24 +2,24 @@
 | 
			
		|||
	"name": "xml",
 | 
			
		||||
	"displayName": "XML Tools",
 | 
			
		||||
	"description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code",
 | 
			
		||||
	"version": "1.6.0",
 | 
			
		||||
	"version": "1.6.1",
 | 
			
		||||
	"publisher": "DotJoshJohnson",
 | 
			
		||||
	"author": {
 | 
			
		||||
		"name": "TrueCommerce",
 | 
			
		||||
		"url": "https://github.com/TrueCommerce"
 | 
			
		||||
		"name": "Josh Johnson",
 | 
			
		||||
		"url": "https://github.com/DotJoshJohnson"
 | 
			
		||||
	},
 | 
			
		||||
	"icon": "resources/icon.png",
 | 
			
		||||
	"icon": "resources/xml.png",
 | 
			
		||||
	"galleryBanner": {
 | 
			
		||||
		"color": "#FFFFFF",
 | 
			
		||||
		"theme": "light"
 | 
			
		||||
	},
 | 
			
		||||
	"homepage": "https://github.com/TrueCommerce/vscode-xml/wiki",
 | 
			
		||||
	"homepage": "https://github.com/DotJoshJohnson/vscode-xml",
 | 
			
		||||
	"repository": {
 | 
			
		||||
		"type": "git",
 | 
			
		||||
		"url": "https://github.com/TrueCommerce/vscode-xml/wiki"
 | 
			
		||||
		"url": "https://github.com/DotJoshJohnson/vscode-xml.git"
 | 
			
		||||
	},
 | 
			
		||||
	"bugs": {
 | 
			
		||||
		"url": "https://github.com/TrueCommerce/vscode-xml/wiki"
 | 
			
		||||
		"url": "https://github.com/DotJoshJohnson/vscode-xml/issues"
 | 
			
		||||
	},
 | 
			
		||||
	"engines": {
 | 
			
		||||
		"vscode": "^0.10.7",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 4.6 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								resources/xml.png
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								resources/xml.png
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 3.2 KiB  | 
		Loading…
	
	Add table
		
		Reference in a new issue