Skip to content

Commit 835cd65

Browse files
committed
fix: Use common TS config
1 parent 76be1d1 commit 835cd65

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"@babel/preset-typescript": "7.17.12",
3939
"@babel/runtime": "7.18.3",
4040
"@codingame/eslint-config": "^1.1.2",
41+
"@codingame/tsconfig": "^1.0.5",
4142
"@rollup/plugin-alias": "3.1.9",
4243
"@rollup/plugin-babel": "5.3.1",
4344
"@rollup/plugin-commonjs": "22.0.0",

rollup/rollup-plugin-remove-vscode-declare-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const plugin: PluginImpl<{}> = () => {
1414
lines.splice(index, 1)
1515
for (; lines[index] !== '}'; index++) {
1616
// unindent
17-
lines[index] = lines[index].slice(4)
17+
lines[index] = lines[index]!.slice(4)
1818
}
1919
lines.splice(index, 1)
2020

src/extensions/cobol.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { StaticFeature, FeatureState, ProtocolRequestType } from 'vscode-languag
55
import { DocumentSelector, ServerCapabilities } from 'vscode-languageserver-protocol'
66
import * as vscode from 'vscode'
77

8-
export const ResolveCobolSubroutineRequestType = new ProtocolRequestType<string, string, never, void, void>('cobol/resolveSubroutine')
8+
export const ResolveCobolSubroutineRequestType = new ProtocolRequestType<string, string | undefined, never, void, void>('cobol/resolveSubroutine')
99
export class CobolResolveSubroutineFeature implements StaticFeature {
1010
private onRequestDisposable: Disposable | undefined
1111
constructor (private languageClient: MonacoLanguageClient) {
@@ -14,7 +14,7 @@ export class CobolResolveSubroutineFeature implements StaticFeature {
1414
fillClientCapabilities (): void {}
1515

1616
initialize (capabilities: ServerCapabilities, documentSelector: DocumentSelector): void {
17-
this.onRequestDisposable = this.languageClient.onRequest(ResolveCobolSubroutineRequestType, (routineName: string): string => {
17+
this.onRequestDisposable = this.languageClient.onRequest(ResolveCobolSubroutineRequestType, (routineName: string): string | undefined => {
1818
const constantRoutinePaths: Partial<Record<string, string>> = {
1919
'assert-equals': `file:${vscode.workspace.rootPath ?? '/tmp/project'}/deps/assert-equals.cbl`
2020
}

src/services/Configuration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function lookUp (tree: any, key: string) {
1313
const parts = key.split('.')
1414
let node = tree
1515
for (let i = 0; node != null && i < parts.length; i++) {
16-
node = node[parts[i]]
16+
node = node[parts[i]!]
1717
}
1818
return node
1919
}

tsconfig.json

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
11
{
2+
"extends": "@codingame/tsconfig",
23
"compilerOptions": {
3-
"allowSyntheticDefaultImports": true,
4-
"strict": true,
54
"baseUrl": "./src",
6-
"esModuleInterop": true,
7-
"forceConsistentCasingInFileNames": true,
85
"isolatedModules": true,
96
"lib": [
107
"dom",
118
"dom.iterable",
129
"esnext"
1310
],
1411
"module": "esnext",
15-
"moduleResolution": "node",
1612
"noEmit": true,
1713
"paths": {
1814
"app/*": [
1915
"*"
2016
]
2117
},
22-
"resolveJsonModule": true,
23-
"sourceMap": true,
24-
"target": "es5"
18+
"sourceMap": true
2519
},
2620
"include": ["src", "rollup", "update-extensions.ts", "rollup.config.ts", "rollup.types.config.ts"],
2721
"exclude": [
2822
"dist",
2923
"node_modules"
30-
],
31-
"ts-node": {
32-
// these options are overrides used only by ts-node
33-
// same as our --compilerOptions flag and our TS_NODE_COMPILER_OPTIONS environment variable
34-
"compilerOptions": {
35-
"module": "commonjs"
36-
}
37-
}
24+
]
3825
}

0 commit comments

Comments
 (0)