Skip to content

Commit a636d1e

Browse files
zardoyzardoy
authored
Merge pull request #197 from zardoy/develop
2 parents 9d4a010 + 1c0edd3 commit a636d1e

18 files changed

+352
-26
lines changed

‎.vscode/settings.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"typescript/lib/tsserverlibrary": {
44
"namespace": "ts",
55
"addImport": false
6+
},
7+
"typescript": {
8+
"namespace": "ts",
9+
"addImport": false
610
}
711
},
812
"typescript.preferences.autoImportFileExcludePatterns": [
@@ -24,5 +28,5 @@
2428
"vitest.showFailMessages": true,
2529
"vitest.include": [
2630
"typescript/test/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"
27-
]
31+
],
2832
}

‎package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
{
7575
"command": "migrateRequireToImports",
7676
"title": "Migrate Require to Imports"
77+
},
78+
{
79+
"command": "wrapIntoNewTag",
80+
"title": "Wrap Into New Tag"
7781
}
7882
],
7983
"keybindings": [
@@ -169,7 +173,7 @@
169173
"@vue/language-server": "latest",
170174
"@vue/language-service": "latest",
171175
"@zardoy/utils": "^0.0.9",
172-
"@zardoy/vscode-utils": "^0.0.47",
176+
"@zardoy/vscode-utils": "^0.0.52",
173177
"chai": "^4.3.6",
174178
"change-case": "^4.1.2",
175179
"chokidar": "^3.5.3",

‎pnpm-lock.yaml

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/configurationType.ts

+28
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,34 @@ export type Configuration = {
680680
// bigFilesThreshold: number
681681
/** @default false */
682682
enableHooksFile: boolean
683+
/**
684+
* @default false
685+
*/
686+
declareMissingPropertyQuickfixOtherFiles: boolean
687+
/**
688+
* @default {}
689+
*/
690+
filesAutoImport: {
691+
[ext: string]: {
692+
/**
693+
* Override import path (default is "$path")
694+
*/
695+
importPath?: string
696+
/**
697+
* Start phrase that will trigger search for available files import
698+
*/
699+
prefix: string
700+
/**
701+
* @default camel
702+
*/
703+
nameCasing?: 'camel' | 'pascal' | 'constant' | 'snake'
704+
/**
705+
* @default $name
706+
*/
707+
nameTransform?: string
708+
iconPost?: string
709+
}
710+
}
683711
}
684712

685713
// scrapped using search editor. config: caseInsensitive, context lines: 0, regex: const fix\w+ = "[^ ]+"

‎src/specialCommands.ts

+33
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import * as vscode from 'vscode'
22
import { getActiveRegularEditor } from '@zardoy/vscode-utils'
33
import { getExtensionCommandId, getExtensionSetting, registerExtensionCommand, VSCodeQuickPickItem } from 'vscode-framework'
4+
import { registerTextEditorCommand } from '@zardoy/vscode-utils/build/commands'
45
import { showQuickPick } from '@zardoy/vscode-utils/build/quickPick'
56
import _ from 'lodash'
67
import { compact } from '@zardoy/utils'
78
import { offsetPosition } from '@zardoy/vscode-utils/build/position'
9+
import { defaultJsSupersetLangs } from '@zardoy/vscode-utils/build/langs'
810
import { RequestInputTypes, RequestOutputTypes } from '../typescript/src/ipcTypes'
911
import { sendCommand } from './sendCommand'
1012
import { tsRangeToVscode, tsRangeToVscodeSelection, tsTextChangesToVscodeTextEdits } from './util'
@@ -319,6 +321,37 @@ export default () => {
319321
await vscode.workspace.applyEdit(edit)
320322
})
321323

324+
registerTextEditorCommand('wrapIntoNewTag', async (editor, edit, fallbackCommand = 'editor.emmet.action.wrapWithAbbreviation') => {
325+
const { selection } = editor
326+
if (selection.start.isEqual(selection.end)) {
327+
const range = editor.selection
328+
const selectedText = '$TM_SELECTED_TEXT'
329+
330+
if (!defaultJsSupersetLangs.includes(editor.document.languageId)) {
331+
if (fallbackCommand) {
332+
await vscode.commands.executeCommand(fallbackCommand, ...fallbackCommand.split(' ').slice(1))
333+
}
334+
335+
return
336+
}
337+
338+
const data = (await sendCommand('getNodePath', {})) ?? []
339+
const jsxElem = [...data].reverse().find(d => ['JsxElement', 'JsxSelfClosingElement', 'JsxFragment'].includes(d.kindName))
340+
if (!jsxElem) return
341+
const { start, end } = jsxElem
342+
const startPos = editor.document.positionAt(start)
343+
const startRange = new vscode.Range(startPos, startPos)
344+
const endPos = editor.document.positionAt(end)
345+
const endRange = new vscode.Range(endPos, endPos)
346+
editor.selection = new vscode.Selection(startRange.start, endRange.end)
347+
}
348+
349+
const line = editor.document.lineAt(editor.selection.start.line)
350+
const currentIndent = line.text.slice(0, line.firstNonWhitespaceCharacterIndex)
351+
await editor.insertSnippet(new vscode.SnippetString(`<\${1:div}$0>\n\t$TM_SELECTED_TEXT\n</\${1:div}>`), editor.selection)
352+
return
353+
})
354+
322355
// registerExtensionCommand('insertImportFlatten', () => {
323356
// // got -> default, got
324357
// type A = ts.Type

‎typescript/src/codeActions/custom/addDestructure/addSplittedDestructure.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { uniq } from 'rambda'
12
import { findChildContainingExactPosition, getChangesTracker, getPositionHighlights, isValidInitializerForDestructure, makeUniqueName } from '../../../utils'
23

34
export default (node: ts.Node, sourceFile: ts.SourceFile, formatOptions: ts.FormatCodeSettings | undefined, languageService: ts.LanguageService) => {
@@ -56,7 +57,7 @@ export default (node: ts.Node, sourceFile: ts.SourceFile, formatOptions: ts.Form
5657

5758
if (!nodeToReplaceWithBindingPattern || propertyNames.length === 0) return
5859

59-
const bindings = propertyNames.map(({ initial, unique }) => {
60+
const bindings = uniq(propertyNames).map(({ initial, unique }) => {
6061
return ts.factory.createBindingElement(undefined, unique ? initial : undefined, unique ?? initial)
6162
})
6263

‎typescript/src/codeActions/extended/declareMissingProperties.ts

+46-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,52 @@ export default {
55
codes: [2339],
66
kind: 'quickfix',
77
title: 'Declare missing property',
8-
tryToApply({ sourceFile, node }) {
8+
tryToApply({ sourceFile, node, c, languageService }) {
99
const param = matchParents(node, ['Identifier', 'BindingElement', 'ObjectBindingPattern', 'Parameter'])
10+
const objAccess = matchParents(node, ['Identifier', 'PropertyAccessExpression'])
11+
const missingPropName = (node as ts.Identifier).text
12+
if (objAccess) {
13+
const checker = languageService.getProgram()!.getTypeChecker()!
14+
const type = checker.getContextualType(objAccess.expression) || checker.getTypeAtLocation(objAccess.expression)
15+
const props = type
16+
.getProperties()
17+
.map(type => {
18+
const node = type.declarations?.find(declaration => {
19+
return c('declareMissingPropertyQuickfixOtherFiles') || declaration.getSourceFile().fileName === sourceFile.fileName
20+
})
21+
if (node === undefined) return undefined!
22+
return { name: type.name, node }
23+
})
24+
.filter(Boolean)
25+
// TARGET PROP
26+
const propInsertAfter = props.find(prop => missingPropName.startsWith(prop.name)) ?? props.at(-1)
27+
if (propInsertAfter) {
28+
const propInsertParent = propInsertAfter.node.parent
29+
const sameParentLiteralProps = props.filter(
30+
prop => prop.node.parent === propInsertParent && ts.isPropertyAssignment(prop.node) && !ts.isIdentifier(prop.node.initializer),
31+
)
32+
const insertObject =
33+
sameParentLiteralProps.length > 0 &&
34+
sameParentLiteralProps.every(sameParentProp => ts.isObjectLiteralExpression((sameParentProp.node as ts.PropertyAssignment).initializer))
35+
const insertPos = propInsertAfter.node.end
36+
const insertComma = sourceFile.getFullText().slice(insertPos - 1, insertPos) !== ','
37+
const getLine = pos => sourceFile.getLineAndCharacterOfPosition(pos).line
38+
const insertNewLine = getLine(propInsertAfter.node.pos) !== getLine(propInsertAfter.node.end)
39+
const insertText = `${insertComma ? ',' : ''}${insertNewLine ? '\n' : ' '}${missingPropName}`
40+
const snippet = insertObject ? `: {${insertNewLine ? '\n\t' : ''}$0${insertNewLine ? '\n' : ''}}` : `$0`
41+
return {
42+
snippetEdits: [
43+
{
44+
newText: `${tsFull.escapeSnippetText(insertText)}${snippet}`,
45+
span: {
46+
length: 0,
47+
start: insertPos,
48+
},
49+
},
50+
],
51+
}
52+
}
53+
}
1054
if (param) {
1155
// special react pattern
1256
if (ts.isArrowFunction(param.parent) && ts.isVariableDeclaration(param.parent.parent)) {
@@ -20,7 +64,7 @@ export default {
2064
const hasMembers = param.type.members.length > 0
2165
const insertPos = param.type.members.at(-1)?.end ?? param.type.end - 1
2266
const insertComma = hasMembers && sourceFile.getFullText().slice(insertPos - 1, insertPos) !== ','
23-
let insertText = (node as ts.Identifier).text
67+
let insertText = missingPropName
2468
if (insertComma) insertText = `, ${insertText}`
2569
// alternatively only one snippetEdit could be used with tsFull.escapeSnippetText(insertText) + $0
2670
return {

‎typescript/src/codeActions/getCodeActions.ts

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { compact } from '@zardoy/utils'
22
import { Except } from 'type-fest'
33
import { findChildContainingExactPosition, findChildContainingPosition } from '../utils'
44
import { ApplyExtendedCodeActionResult, IpcExtendedCodeAction } from '../ipcTypes'
5+
import { GetConfig } from '../types'
56
import objectSwapKeysAndValues from './custom/objectSwapKeysAndValues'
67
import changeStringReplaceToRegex from './custom/changeStringReplaceToRegex'
78
import splitDeclarationAndInitialization from './custom/splitDeclarationAndInitialization'
@@ -56,6 +57,7 @@ export type ApplyExtendedCodeAction = (options: {
5657
/** undefined when no edits is requested */
5758
formatOptions: ts.FormatCodeSettings | undefined
5859
languageService: ts.LanguageService
60+
c: GetConfig
5961
// languageServiceHost: ts.LanguageServiceHost
6062
}) => ApplyExtendedCodeActionResult | boolean | undefined
6163

@@ -80,6 +82,7 @@ export const getExtendedCodeActions = <T extends string | undefined>(
8082
// languageServiceHost: ts.LanguageServiceHost,
8183
formatOptions: ts.FormatCodeSettings | undefined,
8284
applyCodeActionTitle: T,
85+
config: GetConfig,
8386
filterErrorCodes?: number[],
8487
): T extends undefined ? ExtendedCodeAction[] : ApplyExtendedCodeActionResult => {
8588
const range = typeof positionOrRange !== 'number' && positionOrRange.pos !== positionOrRange.end ? positionOrRange : undefined
@@ -93,6 +96,7 @@ export const getExtendedCodeActions = <T extends string | undefined>(
9396
position,
9497
range,
9598
sourceFile,
99+
c: config,
96100
}
97101
if (applyCodeActionTitle) {
98102
const codeAction = extendedCodeActions.find(codeAction => codeAction.title === applyCodeActionTitle)

‎typescript/src/completionEntryDetails.ts

+17-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,29 @@ export default function completionEntryDetails(
2222
const sourceFile = program?.getSourceFile(fileName)
2323
if (!program || !sourceFile) return
2424

25-
const { documentationOverride, documentationAppend, detailPrepend } = prevCompletionsMap[entryName] ?? {}
25+
const { documentationOverride, documentationAppend, detailPrepend, textChanges } = prevCompletionsMap[entryName] ?? {}
2626
if (documentationOverride) {
27-
return {
27+
const prior: ts.CompletionEntryDetails = {
2828
name: entryName,
2929
kind: ts.ScriptElementKind.alias,
3030
kindModifiers: '',
3131
displayParts: typeof documentationOverride === 'string' ? [{ kind: 'text', text: documentationOverride }] : documentationOverride,
3232
}
33+
if (textChanges) {
34+
prior.codeActions = [
35+
// ...(prior.codeActions ?? []),
36+
{
37+
description: 'Includes Text Changes',
38+
changes: [
39+
{
40+
fileName,
41+
textChanges,
42+
},
43+
],
44+
},
45+
]
46+
}
47+
return prior
3348
}
3449
let prior = languageService.getCompletionEntryDetails(
3550
fileName,

0 commit comments

Comments
 (0)