Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master:
  #34, #110 - suppress Intellisense in strings and comments (#339)
  Re-factor code python execution framework  (#345)
  • Loading branch information
DonJayamanne committed Dec 6, 2017
2 parents 30a4091 + 1150480 commit b16d2f9
Show file tree
Hide file tree
Showing 178 changed files with 16,858 additions and 8,383 deletions.
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
"tslint.enable": true,
"python.linting.enabled": false,
"python.formatting.formatOnSave": false,
"python.unitTest.promptToConfigure": false,
"python.workspaceSymbols.enabled": false,
"python.formatting.provider": "yapf"
"python.formatting.provider": "none",
"files.insertFinalNewline": true
}
20 changes: 20 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,26 @@
"isDefault": true
}
},
{
// Task that will replace 'Compile' and 'Hygiene', after being battle-tested.
"label": "Watch",
"type": "gulp",
"task": "watch",
"isBackground": true,
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"problemMatcher": [
"$tsc-watch",
{
"base": "$tslint5",
"fileLocation": "relative"
}
]
},
{
"label": "Hygiene (staged)",
"type": "gulp",
Expand Down
6 changes: 3 additions & 3 deletions CODING_STANDARDS.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ Use undefined. Do not use null.

### Comments

Use JSDoc style comments for functions, interfaces, enums, and classes.
* Comments must end with a period.
* Use JSDoc style comments for functions, interfaces, enums, and classes.

### Strings

Expand All @@ -42,5 +43,4 @@ Use single quotes for strings.

* `else` goes on a the same line from the closing curly brace.
* Use 4 spaces per indentation.


* All files must end with an empty line.
Loading

0 comments on commit b16d2f9

Please sign in to comment.