Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update config references #614

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
db4f82c
Fixup package-lock.json
mark-wiemer Oct 5, 2024
cf09f08
Add validate script, alias prepublish to it
mark-wiemer Oct 5, 2024
9a410ee
Move config access to new config.ts file
mark-wiemer Oct 5, 2024
d5dadbd
Use new configPrefix value
mark-wiemer Oct 5, 2024
e6f95fd
Add license to typescript
mark-wiemer Oct 5, 2024
596d87a
Have TS Lang Server use workspace version
mark-wiemer Oct 5, 2024
42be9e5
Change AHKLSSettings to AHKLSConfig to match VS Code naming
mark-wiemer Oct 5, 2024
a8e335e
Start using getCfg
mark-wiemer Oct 5, 2024
1927e8f
Change update_settings to updateConfig
mark-wiemer Oct 5, 2024
b1081cc
Use getCfg for ExtensionUri
mark-wiemer Oct 5, 2024
b353430
Move ahklsConfig object to config.ts
mark-wiemer Oct 5, 2024
be7f4da
Use ahklsConfig global by default
mark-wiemer Oct 5, 2024
321ff2a
Add mocha for unit tests, add lots of scripts
mark-wiemer Oct 5, 2024
484eb4f
Add prettier
mark-wiemer Oct 5, 2024
74bbc3b
Add sort-package-json
mark-wiemer Oct 5, 2024
8072878
Rename configs to newConfig
mark-wiemer Oct 5, 2024
2228cbd
Update library suggestions correctly
mark-wiemer Oct 5, 2024
dc7b884
Update tests for lib include type
mark-wiemer Oct 5, 2024
260d5f7
Remove updating default value
mark-wiemer Oct 5, 2024
ee2ce10
Set cfg before each library suggestions test
mark-wiemer Oct 5, 2024
7d5ca9a
Add lib helper functions
mark-wiemer Oct 5, 2024
33e45f1
Use enum, not number
mark-wiemer Oct 5, 2024
fb659f5
Fixup tests for setCfg
mark-wiemer Oct 5, 2024
cc0a36f
Indirectly reference AutoLibInclude everywhere
mark-wiemer Oct 5, 2024
3874963
Fixup crlf issue
mark-wiemer Oct 5, 2024
d59bb68
Remove blank newline
mark-wiemer Oct 5, 2024
2d231a0
Update comments
mark-wiemer Oct 5, 2024
234dbb7
Change newset to newConfig
mark-wiemer Oct 5, 2024
91877fc
Cleanup updateCommentTagRegex
mark-wiemer Oct 5, 2024
1c3aca5
Cleanup CompleteFunctionParens
mark-wiemer Oct 5, 2024
a03e774
Cleanup CompletionCommitCharacters
mark-wiemer Oct 5, 2024
c617119
Prep rename to lowercase lexer
mark-wiemer Oct 5, 2024
6dc46c0
Rename to lowercase lexer
mark-wiemer Oct 5, 2024
57e4dba
Add test for updateCommentTagRegex invalid regex
mark-wiemer Oct 5, 2024
3f6e44d
Update diagnostics config
mark-wiemer Oct 5, 2024
cec9490
Use new config.ts for some config work (#42)
mark-wiemer Oct 5, 2024
5a64a7d
Add config utilities and unit tests (#43)
mark-wiemer Oct 5, 2024
57f790f
Add prettier and sort-package-json (#44)
mark-wiemer Oct 5, 2024
9a0c7f1
Merge branch 'upstream-main' into mark-wiemer/config-4
mark-wiemer Oct 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Prettier defaults to LF and most files are already saved that way
* text=auto eol=lf
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"]
}
]
}
}
6 changes: 4 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"typescript.tsc.autoDetect": "off",
"typescript.preferences.quoteStyle": "single",
"git.ignoreLimitWarning": true,
"AutoHotkey2.InterpreterPath": "c:\\Program Files\\AutoHotkey\\v2\\AutoHotkey64.exe"
}
"AutoHotkey2.InterpreterPath": "c:\\Program Files\\AutoHotkey\\v2\\AutoHotkey64.exe",
"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
Loading