Skip to content

Commit

Permalink
Add prettier and sort-package-json (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-wiemer authored Oct 5, 2024
1 parent 5a64a7d commit 57f790f
Show file tree
Hide file tree
Showing 32 changed files with 3,729 additions and 3,151 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

github: thqby
custom:
- https://www.paypal.me/thqby
- https://www.paypal.me/thqby
6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Build

on:
push:
branches: ["main"]
branches: ['main']
pull_request:
branches: ["main"]
branches: ['main']
workflow_dispatch:
merge_group:

Expand All @@ -27,6 +27,6 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
cache: 'npm'
- run: npm install
- run: npm run vscode:prepublish
24 changes: 24 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
client/src/browserClientMain.ts
client/src/extension.ts
client/src/test/utils.ts
server/src/ahkProvider.ts
server/src/browserServerMain.ts
server/src/codeActionProvider.ts
server/src/colorProvider.ts
server/src/commandProvider.ts
server/src/common.ts
server/src/completionProvider.ts
server/src/constants.ts
server/src/definitionProvider.ts
server/src/formattingProvider.ts
server/src/hoverProvider.ts
server/src/Lexer.ts
server/src/localize.ts
server/src/PEFile.ts
server/src/referencesProvider.ts
server/src/renameProvider.ts
server/src/scriptrunner.ts
server/src/semanticTokensProvider.ts
server/src/server.ts
server/src/signatureProvider.ts
server/src/symbolProvider.ts
19 changes: 10 additions & 9 deletions .vscode-test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@ import { defineConfig } from '@vscode/test-cli';
import { execSync } from 'child_process';

let timeout, vscode_path;
if (process.execPath.toLowerCase().endsWith('code.exe'))
timeout = 0;
if (process.execPath.toLowerCase().endsWith('code.exe')) timeout = 0;
else {
try {
const m = execSync('chcp 65001 && reg query HKCR\\vscode\\shell\\open\\command', { encoding: 'utf8' })
.match(/REG_SZ\s+("([^"]+)"|\S+)/);
const m = execSync(
'chcp 65001 && reg query HKCR\\vscode\\shell\\open\\command',
{ encoding: 'utf8' },
).match(/REG_SZ\s+("([^"]+)"|\S+)/);
vscode_path = m[2] || m[1];
} catch { }
} catch {}
}

export default defineConfig({
files: 'client/dist/test/**/*.test.js',
mocha: {
failZero: true,
timeout
timeout,
},
useInstallation: vscode_path && {
fromPath: vscode_path
}
});
fromPath: vscode_path,
},
});
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"connor4312.esbuild-problem-matchers",
"dbaeumer.vscode-eslint"
]
}
}
19 changes: 5 additions & 14 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
"name": "Launch Client",
"runtimeExecutable": "${execPath}",
"preLaunchTask": "npm: watch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/client/dist/**/*.js"
]
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/client/dist/**/*.js"]
},
{
"type": "node",
Expand All @@ -36,9 +32,7 @@
"--disable-extensions",
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/client/dist/test/**/*.js"
],
"outFiles": ["${workspaceFolder}/client/dist/test/**/*.js"],
"testConfiguration": "${workspaceFolder}/.vscode-test.mjs"
},
{
Expand All @@ -61,10 +55,7 @@
"compounds": [
{
"name": "Client + Server",
"configurations": [
"Launch Client",
"Attach to Server"
]
"configurations": ["Launch Client", "Attach to Server"]
}
]
}
}
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"typescript.preferences.quoteStyle": "single",
"git.ignoreLimitWarning": true,
"AutoHotkey2.InterpreterPath": "c:\\Program Files\\AutoHotkey\\v2\\AutoHotkey64.exe",
"typescript.tsdk": "node_modules\\typescript\\lib"
}
"typescript.tsdk": "node_modules\\typescript\\lib",
"editor.formatOnSave": true
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
"problemMatcher": "$esbuild-watch"
}
]
}
}
Loading

0 comments on commit 57f790f

Please sign in to comment.