Skip to content

Commit a30cb0c

Browse files
committed
update ts in project add tests for method snippets
improve perf of findChildNode fix: escape $ in banned builtin positions fix: don't expand method snippet (including builtin) in mroe places such as object expressions
1 parent 6faecfb commit a30cb0c

File tree

7 files changed

+111
-50
lines changed

7 files changed

+111
-50
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"fs-extra": "^10.1.0",
4848
"type-fest": "^2.13.1",
4949
"typed-jsonfile": "^0.2.1",
50-
"typescript": "^4.5.4",
50+
"typescript-old": "npm:[email protected]",
51+
"typescript": "^4.8.3",
5152
"typescript-essential-plugins": "workspace:*",
5253
"vitest": "^0.15.1",
5354
"vscode-manifest": "^0.0.4"

pnpm-lock.yaml

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

typescript/src/completionsAtPosition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as emmet from '@vscode/emmet-helper'
44
import isInBannedPosition from './isInBannedPosition'
55
import { GetConfig } from './types'
66
import { findChildContainingPosition } from './utils'
7-
import { isGoodPositionBuiltinMethodCompletion } from './isGootPositionMethodCompletion'
7+
import { isGoodPositionBuiltinMethodCompletion } from './isGoodPositionMethodCompletion'
88

99
export type PrevCompletionMap = Record<string, { originalName?: string; documentationOverride?: string | tslib.SymbolDisplayPart[] }>
1010

typescript/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import _ from 'lodash'
77
import { GetConfig } from './types'
88
import { getCompletionsAtPosition, PrevCompletionMap } from './completionsAtPosition'
99
import { oneOf } from '@zardoy/utils'
10-
import { isGoodPositionMethodCompletion } from './isGootPositionMethodCompletion'
10+
import { isGoodPositionMethodCompletion } from './isGoodPositionMethodCompletion'
1111

1212
const thisPluginMarker = Symbol('__essentialPluginsMarker__')
1313

typescript/src/isGootPositionMethodCompletion.ts renamed to typescript/src/isGoodPositionMethodCompletion.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import type tslib from 'typescript/lib/tsserverlibrary'
2-
import { findChildContainingPosition } from './utils'
2+
import { findChildContainingPosition, findChildContainingPositionMaxDepth } from './utils'
33

44
export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFile: tslib.SourceFile, position: number) => {
5-
const importClauseCandidate = findChildContainingPosition(ts, sourceFile, position, 2)
5+
const importClauseCandidate = findChildContainingPositionMaxDepth(ts, sourceFile, position, 2)
6+
console.log(sourceFile.getFullText().slice(0, position))
67
if (importClauseCandidate?.kind === 266) return false
78
const currentNode = findChildContainingPosition(ts, sourceFile, position)
89
// const obj = { method() {}, arrow: () => {} }

0 commit comments

Comments
 (0)