Skip to content

Commit a3d10bf

Browse files
trauntstraunts
committed
Merge branch 'main' into development
2 parents 8f56250 + e2e58b1 commit a3d10bf

Some content is hidden

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

92 files changed

+16833
-15001
lines changed

‎.eslintrc.json‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nrwl/nx", "@nx", "eslint-plugin-unused-imports"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -18,13 +18,26 @@
1818
}
1919
]
2020
}
21+
],
22+
"@typescript-eslint/no-unused-vars": "off",
23+
"unused-imports/no-unused-imports": "warn",
24+
"unused-imports/no-unused-vars": [
25+
"warn",
26+
{
27+
"vars": "all",
28+
"varsIgnorePattern": "^_",
29+
"args": "after-used",
30+
"argsIgnorePattern": "^_"
31+
}
2132
]
2233
}
2334
},
2435
{
2536
"files": ["*.ts", "*.tsx"],
2637
"extends": ["plugin:@nrwl/nx/typescript"],
27-
"rules": {}
38+
"rules": {
39+
"@typescript-eslint/no-unused-vars": "off"
40+
}
2841
},
2942
{
3043
"files": ["*.js", "*.jsx"],
@@ -37,6 +50,18 @@
3750
"jest": true
3851
},
3952
"rules": {}
53+
},
54+
{
55+
"files": ["*.json"],
56+
"parser": "jsonc-eslint-parser",
57+
"rules": {
58+
"@nx/dependency-checks": [
59+
"error",
60+
{
61+
"ignoredFiles": ["**/webpack.config.js"]
62+
}
63+
]
64+
}
4065
}
4166
]
4267
}

‎.gitignore‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,32 @@ node_modules
22
*.vsix
33
dist/**
44
tmp/**
5-
.nx
5+
temp.*
6+
.nx/**
7+
8+
# C artifacts
9+
*.a
10+
*.so
11+
*.so.*
12+
*.dylib
13+
*.dll
14+
*.pc
15+
16+
*.dll
17+
*.exp
18+
*.lib
19+
20+
# Example dirs
21+
/examples/*/
22+
23+
# Grammar volatiles
24+
*.wasm
25+
*.obj
26+
*.o
27+
28+
29+
# Archives
30+
*.tar.gz
31+
*.tgz
32+
*.zip
33+

‎.prettierignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
/dist
44
/coverage
55

6-
/.nx/cache
6+
/.nx/cache
7+
/packages/tree-sitter-ccini/bindings/**
8+
/.nx/workspace-data

‎.prettierrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"singleQuote": true
2+
"singleQuote": true,
3+
"endOfLine": "crlf"
34
}

‎.vscode/c_cpp_properties.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Win32",
5+
"includePath": ["${workspaceFolder}/**"],
6+
"defines": ["_DEBUG", "UNICODE", "_UNICODE"]
7+
}
8+
],
9+
"version": 4
10+
}

‎.vscode/launch.json‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@
99
"runtimeExecutable": "${execPath}",
1010
"args": [
1111
"--extensionDevelopmentPath=${workspaceRoot}",
12-
"--disableExtension=cortex-command-community-project-language-support"
12+
"--disable-extensions"
1313
],
14-
"outFiles": ["${workspaceRoot}/dist/client/out/**/*.js"],
14+
"outFiles": ["${workspaceRoot}/dist/**/*.js"],
1515
"autoAttachChildProcesses": true,
16-
"preLaunchTask": "watch"
16+
"preLaunchTask": "build-affected"
17+
},
18+
{
19+
"name": "Attach to Language Server",
20+
"type": "node",
21+
"request": "attach",
22+
"outFiles": ["${workspaceRoot}/dist/**/*.js"],
23+
"sourceMaps": true,
24+
"restart": true
1725
},
1826
{
1927
"name": "Language Server E2E Test",
@@ -27,5 +35,11 @@
2735
],
2836
"outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
2937
}
38+
],
39+
"compounds": [
40+
{
41+
"name": "Launch Client and Attach to Server",
42+
"configurations": ["Launch Client", "Attach to Language Server"]
43+
}
3044
]
3145
}

‎.vscode/settings.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,25 @@
88
"editor.defaultFormatter": "esbenp.prettier-vscode",
99
"editor.codeActionsOnSave": {
1010
"source.fixAll.eslint": "explicit"
11-
}
11+
},
12+
"[c]": {
13+
"editor.defaultFormatter": "ms-vscode.cpptools"
14+
},
15+
"C_Cpp.vcFormat.newLine.beforeOpenBrace.block": "sameLine",
16+
"C_Cpp.vcFormat.newLine.beforeOpenBrace.function": "sameLine",
17+
"C_Cpp.vcFormat.newLine.beforeOpenBrace.type": "sameLine",
18+
"C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction": true,
19+
"C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyType": true,
20+
"C_Cpp.doxygen.generatedStyle": "/**",
21+
"C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 2, ColumnLimit: 0}",
22+
"C_Cpp.codeAnalysis.runAutomatically": true,
23+
"nxConsole.commonNxCommands": [
24+
"run",
25+
"run-many",
26+
"affected",
27+
"affected --graph",
28+
"list",
29+
"run-many -t build --skip-nx-cache"
30+
],
31+
"npm.exclude": ["**/.nx/**"]
1232
}

‎.vscode/tasks.json‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,16 @@
33
"tasks": [
44
{
55
"type": "shell",
6-
"command": "npx nx build syntaxes",
7-
"label": "build_syntaxes",
8-
"problemMatcher": ["$tsc"]
9-
},
10-
{
11-
"type": "shell",
12-
"label": "watch",
13-
"command": "npx nx affected --verbose --target=watch --exclude=syntaxes",
14-
"isBackground": true,
6+
"label": "build-affected",
7+
"detail": "Build all affected projects in the workspace",
8+
"command": "npx nx run-many --verbose --target=build",
159
"group": {
1610
"kind": "build",
1711
"isDefault": true
1812
},
1913
"presentation": {
2014
"panel": "dedicated"
21-
},
22-
"problemMatcher": ["$tsc-watch"],
23-
"dependsOn": "build_syntaxes"
15+
}
2416
}
2517
]
2618
}

‎.vscode/tmlanguage.json‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,27 @@
3131
"uuid": { "type": "string" },
3232
"firstLineMatch": { "type": "string" }
3333
},
34-
"required": [ "scopeName" ]
34+
"required": ["scopeName"]
3535
}
3636
]
3737
},
3838
"grammar": {
3939
"type": "object",
40-
"properties": {
41-
"patterns": {
42-
"type": "array",
43-
"items": { "$ref": "#/definitions/pattern" },
44-
"default": [ ]
45-
},
46-
"repository": {
47-
"description": "a dictionary (i.e. key/value pairs) of rules which can be included from other places in the grammar. The key is the name of the rule and the value is the actual rule. Further explanation (and example) follow with the description of the include rule key.",
48-
"type": "object",
49-
"additionalProperties": {
50-
"$ref": "#/definitions/pattern"
51-
}
52-
}
40+
"properties": {
41+
"patterns": {
42+
"type": "array",
43+
"items": { "$ref": "#/definitions/pattern" },
44+
"default": []
5345
},
54-
"required": [
55-
"patterns"
56-
]
46+
"repository": {
47+
"description": "a dictionary (i.e. key/value pairs) of rules which can be included from other places in the grammar. The key is the name of the rule and the value is the actual rule. Further explanation (and example) follow with the description of the include rule key.",
48+
"type": "object",
49+
"additionalProperties": {
50+
"$ref": "#/definitions/pattern"
51+
}
52+
}
53+
},
54+
"required": ["patterns"]
5755
},
5856
"captures": {
5957
"type": "object",
@@ -65,7 +63,7 @@
6563
"patterns": {
6664
"type": "array",
6765
"items": { "$ref": "#/definitions/pattern" },
68-
"default": [ ]
66+
"default": []
6967
}
7068
},
7169
"additionalProperties": false
@@ -77,7 +75,12 @@
7775
"type": "object",
7876
"properties": {
7977
"comment": { "type": "string" },
80-
"disabled": { "type": "integer", "minimum": 0, "maximum": 1, "description": "set this property to 1 to disable the current pattern" },
78+
"disabled": {
79+
"type": "integer",
80+
"minimum": 0,
81+
"maximum": 1,
82+
"description": "set this property to 1 to disable the current pattern"
83+
},
8184
"include": {
8285
"description": "this allows you to reference a different language, recursively reference the grammar itself or a rule declared in this file’s repository.",
8386
"type": "string"
@@ -126,7 +129,7 @@
126129
"description": "applies to the region between the begin and end matches",
127130
"type": "array",
128131
"items": { "$ref": "#/definitions/pattern" },
129-
"default": [ ]
132+
"default": []
130133
},
131134
"applyEndPatternLast": {
132135
"type": "integer",
@@ -136,25 +139,25 @@
136139
},
137140
"dependencies": {
138141
"begin": {
139-
"anyOf": [{ "required": [ "end" ] }, { "required": [ "while" ] }]
142+
"anyOf": [{ "required": ["end"] }, { "required": ["while"] }]
140143
},
141-
"end": [ "begin" ],
142-
"while": [ "begin" ],
144+
"end": ["begin"],
145+
"while": ["begin"],
143146
"contentName": {
144147
"anyOf": [
145-
{ "required": [ "begin", "end" ] },
146-
{ "required": [ "begin", "while" ] }
148+
{ "required": ["begin", "end"] },
149+
{ "required": ["begin", "while"] }
147150
]
148151
},
149152
"beginCaptures": {
150153
"anyOf": [
151-
{ "required": [ "begin", "end" ] },
152-
{ "required": [ "begin", "while" ] }
154+
{ "required": ["begin", "end"] },
155+
{ "required": ["begin", "while"] }
153156
]
154157
},
155-
"whileCaptures": [ "begin", "while" ],
156-
"endCaptures": [ "begin", "end" ],
157-
"applyEndPatternLast": [ "end" ]
158+
"whileCaptures": ["begin", "while"],
159+
"endCaptures": ["begin", "end"],
160+
"applyEndPatternLast": ["end"]
158161
}
159162
},
160163
"name": {

‎.vscodeignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
!icon.png
88
!LICENSE.md
99
!package.json
10-
!README.md
10+
!README.md

0 commit comments

Comments
 (0)