Skip to content

Commit

Permalink
Code review updates and general tweaks and fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
BarryNolte committed Nov 8, 2023
1 parent 748398b commit ccbe41f
Show file tree
Hide file tree
Showing 11 changed files with 1,702 additions and 1,207 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ dist
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.vscode/settings.json
package-lock.json
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"name": "Launch Extension",
"outFiles": [
"${workspaceFolder}/dist/**/*.js",
"${workspaceFolder}/langsrv/dist/**/*.js"
"${workspaceFolder}/client/dist/**/*.js",
"${workspaceFolder}/server/dist/**/*.js"
],
"request": "launch",
"type": "extensionHost"
Expand Down
42 changes: 21 additions & 21 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@
"vscode": "^1.73.0"
},
"devDependencies": {
"@types/glob": "^8.0.0",
"@types/markdown-it-container": "^2.0.5",
"@types/mocha": "^10.0.0",
"@types/node": "16.x",
"@types/vscode": "^1.73.0",
"@typescript-eslint/eslint-plugin": "^5.50.0",
"@typescript-eslint/parser": "^5.50.0",
"@vscode/test-electron": "^2.2.0",
"@vscode/vsce": "^2.15.0",
"eslint": "^8.33.0",
"eslint-config-prettier": "^8.6.0",
"eslint-formatter-pretty": "^4.1.0",
"eslint-webpack-plugin": "^3.2.0",
"glob": "^8.0.3",
"mocha": "^10.1.0",
"prettier": "^2.8.3",
"ts-loader": "^9.4.2",
"typescript": "^4.9.4",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
"@types/glob": "^8.1.0",
"@types/markdown-it-container": "^2.0.8",
"@types/mocha": "^10.0.3",
"@types/node": "^20.8.10",
"@types/vscode": "^1.84.0",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@vscode/test-electron": "^2.3.6",
"@vscode/vsce": "^2.22.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-formatter-pretty": "^6.0.0",
"eslint-webpack-plugin": "^4.0.1",
"glob": "^10.3.10",
"mocha": "^10.2.0",
"prettier": "^3.0.3",
"ts-loader": "^9.5.0",
"typescript": "^5.2.2",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"markdown-it-container": "^3.0.0",
"path": "^0.12.7",
"vscode-languageclient": "^8.1.0"
"vscode-languageclient": "^9.0.1"
},
"homepage": "https://d2lang.com",
"icon": "d2-icon.png",
Expand Down
2 changes: 1 addition & 1 deletion client/src/docToPreviewGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class DocToPreviewGenerator {
"warning:100:20:explaination"
*/
const rg = new RegExp(/^(.*?):(\d+):(\d+):(\s+)(.*)$/g).exec(s);
const msg = rg !== null ? rg[5] : "Unknown Error";
const msg = rg !== null ? rg[5] : s;
const line = rg ? rg[2] || "0" : "0";
const col = rg ? rg[3] || "0" : "0";
list += `<li>${msg} (${line}:${col})</li>`;
Expand Down
2 changes: 1 addition & 1 deletion client/src/refreshTimer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ws } from "./extension";
type TimerCallback = () => void;

export class RefreshTimer {
timerId?: NodeJS.Timer;
timerId?: NodeJS.Timeout;
callback: TimerCallback;
interval = 0;

Expand Down
Loading

0 comments on commit ccbe41f

Please sign in to comment.