Skip to content

Commit b16d2f9

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: #34, #110 - suppress Intellisense in strings and comments (#339) Re-factor code python execution framework (#345)
2 parents 30a4091 + 1150480 commit b16d2f9

File tree

178 files changed

+16858
-8383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+16858
-8383
lines changed

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
1616
"tslint.enable": true,
1717
"python.linting.enabled": false,
18-
"python.formatting.formatOnSave": false,
1918
"python.unitTest.promptToConfigure": false,
2019
"python.workspaceSymbols.enabled": false,
21-
"python.formatting.provider": "yapf"
20+
"python.formatting.provider": "none",
21+
"files.insertFinalNewline": true
2222
}

.vscode/tasks.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,26 @@
4747
"isDefault": true
4848
}
4949
},
50+
{
51+
// Task that will replace 'Compile' and 'Hygiene', after being battle-tested.
52+
"label": "Watch",
53+
"type": "gulp",
54+
"task": "watch",
55+
"isBackground": true,
56+
"presentation": {
57+
"echo": true,
58+
"reveal": "always",
59+
"focus": false,
60+
"panel": "shared"
61+
},
62+
"problemMatcher": [
63+
"$tsc-watch",
64+
{
65+
"base": "$tslint5",
66+
"fileLocation": "relative"
67+
}
68+
]
69+
},
5070
{
5171
"label": "Hygiene (staged)",
5272
"type": "gulp",

CODING_STANDARDS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ Use undefined. Do not use null.
2323

2424
### Comments
2525

26-
Use JSDoc style comments for functions, interfaces, enums, and classes.
26+
* Comments must end with a period.
27+
* Use JSDoc style comments for functions, interfaces, enums, and classes.
2728

2829
### Strings
2930

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

4344
* `else` goes on a the same line from the closing curly brace.
4445
* Use 4 spaces per indentation.
45-
46-
46+
* All files must end with an empty line.

0 commit comments

Comments
 (0)