Skip to content

Commit

Permalink
Merge branch 'master' into introduce-deactivate-method
Browse files Browse the repository at this point in the history
  • Loading branch information
zabil authored Oct 31, 2023
2 parents a8defe7 + 0c88370 commit 7fb535f
Show file tree
Hide file tree
Showing 10 changed files with 948 additions and 1,043 deletions.
49 changes: 25 additions & 24 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.tabSize": 4,
"editor.insertSpaces": true,
"editor.tabSize": 4,
"editor.insertSpaces": true,

"files.eol": "\n",
"files.trimTrailingWhitespace": true,
"files.eol": "\n",
"files.trimTrailingWhitespace": true,

"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.tsserver.trace": "off",
"typescript.format.insertSpaceAfterCommaDelimiter": true,
"typescript.format.insertSpaceAfterSemicolonInForStatements": true,
"typescript.format.insertSpaceBeforeAndAfterBinaryOperators": true,
"typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": true,
"typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
"typescript.format.placeOpenBraceOnNewLineForFunctions": false,
"typescript.format.placeOpenBraceOnNewLineForControlBlocks": false,
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.tsserver.trace": "off",
"typescript.format.insertSpaceAfterCommaDelimiter": true,
"typescript.format.insertSpaceAfterSemicolonInForStatements": true,
"typescript.format.insertSpaceBeforeAndAfterBinaryOperators": true,
"typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": true,
"typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
"typescript.format.placeOpenBraceOnNewLineForFunctions": false,
"typescript.format.placeOpenBraceOnNewLineForControlBlocks": false,

"javascript.validate.enable": false,
"javascript.validate.enable": false,

"eslint.enable": true,
"tslint.enable": true,
"files.associations": {
"*.spec": "gauge",
"*.cpt": "gauge"
}
}
"eslint.enable": true,
"tslint.enable": true,
"files.associations": {
"*.spec": "gauge",
"*.cpt": "gauge"
},
"editor.formatOnSaveMode": "modificationsIfAvailable"
}
Loading

0 comments on commit 7fb535f

Please sign in to comment.