@zzzen/pyright-internal 1.2.0-dev.20260816 → 1.2.0-dev.20260823
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/analyzerNodeInfo.d.ts +119 -24
- package/dist/analyzer/analyzerNodeInfo.js +408 -89
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/binder.d.ts +6 -3
- package/dist/analyzer/binder.js +70 -69
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.d.ts +4 -2
- package/dist/analyzer/checker.js +55 -34
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +2 -1
- package/dist/analyzer/codeFlowEngine.js +12 -10
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowUtils.d.ts +2 -1
- package/dist/analyzer/codeFlowUtils.js +2 -3
- package/dist/analyzer/codeFlowUtils.js.map +1 -1
- package/dist/analyzer/dataClasses.d.ts +5 -4
- package/dist/analyzer/dataClasses.js +21 -56
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +2 -1
- package/dist/analyzer/declarationUtils.js +2 -2
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.d.ts +5 -4
- package/dist/analyzer/decorators.js +20 -21
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/enums.d.ts +5 -4
- package/dist/analyzer/enums.js +11 -10
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +1 -1
- package/dist/analyzer/importResolver.js +5 -3
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +3 -1
- package/dist/analyzer/importStatementUtils.js +14 -7
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.d.ts +2 -1
- package/dist/analyzer/namedTuples.js +3 -4
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.d.ts +3 -2
- package/dist/analyzer/operations.js +8 -8
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +2 -2
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +13 -11
- package/dist/analyzer/parseTreeUtils.js +62 -36
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.d.ts +7 -2
- package/dist/analyzer/parseTreeWalker.js +29 -175
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.d.ts +4 -3
- package/dist/analyzer/patternMatching.js +47 -43
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +12 -0
- package/dist/analyzer/program.js +235 -29
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.d.ts +4 -3
- package/dist/analyzer/properties.js +7 -8
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +14 -2
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/scopeUtils.d.ts +4 -3
- package/dist/analyzer/scopeUtils.js +8 -8
- package/dist/analyzer/scopeUtils.js.map +1 -1
- package/dist/analyzer/sentinel.d.ts +2 -1
- package/dist/analyzer/sentinel.js +2 -3
- package/dist/analyzer/sentinel.js.map +1 -1
- package/dist/analyzer/service.js +28 -10
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceEnumerator.d.ts +5 -0
- package/dist/analyzer/sourceEnumerator.js +57 -3
- package/dist/analyzer/sourceEnumerator.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +12 -6
- package/dist/analyzer/sourceFile.js +73 -50
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.d.ts +1 -0
- package/dist/analyzer/sourceFileInfoUtils.js +8 -0
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +4 -1
- package/dist/analyzer/sourceMapper.js +14 -8
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/testWalker.js +2 -1
- package/dist/analyzer/testWalker.js.map +1 -1
- package/dist/analyzer/tracePrinter.d.ts +2 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/tuples.d.ts +3 -2
- package/dist/analyzer/tuples.js +5 -5
- package/dist/analyzer/tuples.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.d.ts +5 -7
- package/dist/analyzer/typeDocStringUtils.js +229 -132
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.d.ts +2 -0
- package/dist/analyzer/typeEvaluator.js +326 -198
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +2 -0
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +3 -2
- package/dist/analyzer/typeGuards.js +26 -25
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +12 -9
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.js +3 -1
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.d.ts +4 -3
- package/dist/analyzer/typedDicts.js +15 -14
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/collectionUtils.js +15 -6
- package/dist/common/collectionUtils.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +1 -0
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.d.ts +4 -1
- package/dist/common/configOptions.js +68 -12
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +1 -0
- package/dist/common/envVarUtils.js +41 -10
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +3 -1
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/extraPathGlob.d.ts +12 -0
- package/dist/common/extraPathGlob.js +315 -0
- package/dist/common/extraPathGlob.js.map +1 -0
- package/dist/common/host.d.ts +2 -0
- package/dist/common/host.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +2 -1
- package/dist/common/languageServerInterface.js.map +1 -1
- package/dist/common/pathConsts.d.ts +1 -0
- package/dist/common/pathConsts.js +11 -1
- package/dist/common/pathConsts.js.map +1 -1
- package/dist/common/processUtils.d.ts +4 -2
- package/dist/common/processUtils.js +3 -0
- package/dist/common/processUtils.js.map +1 -1
- package/dist/common/stringUtils.d.ts +6 -0
- package/dist/common/stringUtils.js +87 -5
- package/dist/common/stringUtils.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +3 -1
- package/dist/common/textEditTracker.js +8 -6
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/textRangeCollection.d.ts +1 -0
- package/dist/common/textRangeCollection.js +32 -1
- package/dist/common/textRangeCollection.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +3 -0
- package/dist/common/uri/uriUtils.js +65 -15
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/fileSystemMapping.d.ts +10 -0
- package/dist/fileSystemMapping.js +176 -0
- package/dist/fileSystemMapping.js.map +1 -0
- package/dist/languageService/analyzerServiceExecutor.js +2 -1
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +1 -0
- package/dist/languageService/autoImporter.js +32 -5
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.d.ts +7 -0
- package/dist/languageService/callHierarchyProvider.js +97 -11
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +30 -8
- package/dist/languageService/completionProvider.js +298 -93
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +7 -6
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.js +2 -1
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +3 -1
- package/dist/languageService/documentSymbolCollector.js +78 -14
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.js +3 -2
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/fileWatcherDynamicFeature.js +28 -1
- package/dist/languageService/fileWatcherDynamicFeature.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +2 -1
- package/dist/languageService/hoverProvider.js +48 -16
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.d.ts +3 -1
- package/dist/languageService/importSorter.js +4 -2
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/importStatementCandidates.js +4 -2
- package/dist/languageService/importStatementCandidates.js.map +1 -1
- package/dist/languageService/quickActions.js +2 -1
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.js +12 -5
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +3 -0
- package/dist/languageService/signatureHelpProvider.js +56 -18
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +2 -1
- package/dist/languageService/symbolIndexer.js +7 -7
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.d.ts +1 -1
- package/dist/languageService/tooltipUtils.js +103 -35
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +3 -2
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +6 -0
- package/dist/localization/localize.js +10 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +11 -0
- package/dist/localization/package.nls.de.json +11 -0
- package/dist/localization/package.nls.en-us.json +5 -0
- package/dist/localization/package.nls.es.json +11 -0
- package/dist/localization/package.nls.fr.json +11 -0
- package/dist/localization/package.nls.it.json +11 -0
- package/dist/localization/package.nls.ja.json +11 -0
- package/dist/localization/package.nls.ko.json +11 -0
- package/dist/localization/package.nls.pl.json +11 -0
- package/dist/localization/package.nls.pt-br.json +11 -0
- package/dist/localization/package.nls.qps-ploc.json +11 -0
- package/dist/localization/package.nls.ru.json +11 -0
- package/dist/localization/package.nls.tr.json +11 -0
- package/dist/localization/package.nls.zh-cn.json +12 -1
- package/dist/localization/package.nls.zh-tw.json +13 -2
- package/dist/parser/parseNodes.d.ts +85 -80
- package/dist/parser/parseNodes.js +182 -159
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parseTreeUtils.d.ts +3 -0
- package/dist/parser/parseTreeUtils.js +209 -0
- package/dist/parser/parseTreeUtils.js.map +1 -0
- package/dist/parser/parser.d.ts +16 -6
- package/dist/parser/parser.js +210 -144
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringAnnotationInfo.d.ts +16 -0
- package/dist/parser/stringAnnotationInfo.js +26 -0
- package/dist/parser/stringAnnotationInfo.js.map +1 -0
- package/dist/readonlyAugmentedFileSystem.d.ts +2 -9
- package/dist/readonlyAugmentedFileSystem.js +17 -144
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/tests/analyzerNodeInfo.test.d.ts +1 -0
- package/dist/tests/analyzerNodeInfo.test.js +113 -0
- package/dist/tests/analyzerNodeInfo.test.js.map +1 -0
- package/dist/tests/collectionUtils.test.js +46 -0
- package/dist/tests/collectionUtils.test.js.map +1 -1
- package/dist/tests/completions.test.js +34 -0
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +131 -6
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/extraPathGlob.test.d.ts +1 -0
- package/dist/tests/extraPathGlob.test.js +434 -0
- package/dist/tests/extraPathGlob.test.js.map +1 -0
- package/dist/tests/fileSystemMapping.test.d.ts +1 -0
- package/dist/tests/fileSystemMapping.test.js +458 -0
- package/dist/tests/fileSystemMapping.test.js.map +1 -0
- package/dist/tests/fourslash/completions.call.typedDict.fourslash.js +23 -0
- package/dist/tests/fourslash/completions.call.typedDict.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.call.typedDict.list.fourslash.js +14 -0
- package/dist/tests/fourslash/completions.call.typedDict.list.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.call.typedDict.states.fourslash.js +7 -0
- package/dist/tests/fourslash/completions.call.typedDict.states.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.js +41 -0
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.js.map +1 -0
- package/dist/tests/fourslash/completions.dictionary.keys.literalTypes.fourslash.js +2 -0
- package/dist/tests/fourslash/completions.dictionary.keys.literalTypes.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.fstring.stringLiteral.fourslash.js +5 -0
- package/dist/tests/fourslash/completions.fstring.stringLiteral.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.stringLiteral.fourslash.js +4 -0
- package/dist/tests/fourslash/completions.stringLiteral.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.js +48 -0
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.js.map +1 -0
- package/dist/tests/fourslash/hover.inherited.docFromSrc.fourslash.js +8 -2
- package/dist/tests/fourslash/hover.inherited.docFromSrc.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.inherited.docFromStub.fourslash.js +5 -2
- package/dist/tests/fourslash/hover.inherited.docFromStub.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.docstrings.overloaded.fourslash.js +2 -2
- package/dist/tests/fourslash/signature.docstrings.overloaded.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.js +1 -1
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/hoverProvider.test.js +38 -0
- package/dist/tests/hoverProvider.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +6 -3
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +38 -0
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +88 -0
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/parser.test.js +60 -3
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/positionUtils.test.js +23 -0
- package/dist/tests/positionUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +41 -0
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/service.test.js +77 -0
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/sourceEnumeratorSymlink.test.d.ts +1 -0
- package/dist/tests/sourceEnumeratorSymlink.test.js +203 -0
- package/dist/tests/sourceEnumeratorSymlink.test.js.map +1 -0
- package/dist/tests/stringUtils.test.js +84 -0
- package/dist/tests/stringUtils.test.js.map +1 -1
- package/dist/tests/symlinkAliasInvalidation.test.d.ts +1 -0
- package/dist/tests/symlinkAliasInvalidation.test.js +471 -0
- package/dist/tests/symlinkAliasInvalidation.test.js.map +1 -0
- package/dist/tests/testUtils.d.ts +2 -0
- package/dist/tests/testUtils.js +7 -1
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +2 -2
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/textRangeCollection.test.d.ts +1 -0
- package/dist/tests/textRangeCollection.test.js +137 -0
- package/dist/tests/textRangeCollection.test.js.map +1 -0
- package/dist/tests/typeEvaluator1.test.js +24 -3
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +4 -0
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +4 -0
- package/dist/tests/typeEvaluator7.test.js.map +1 -1
- package/dist/tests/typeServer/typeCache.test.d.ts +1 -0
- package/dist/tests/typeServer/typeCache.test.js +69 -0
- package/dist/tests/typeServer/typeCache.test.js.map +1 -0
- package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.js +18 -0
- package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.js.map +1 -1
- package/dist/tests/uri.test.js +51 -0
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/typeServer/notebookDocumentHandler.d.ts +9 -2
- package/dist/typeServer/notebookDocumentHandler.js +16 -6
- package/dist/typeServer/notebookDocumentHandler.js.map +1 -1
- package/dist/typeServer/programWrapper.d.ts +1 -0
- package/dist/typeServer/programWrapper.js +28 -15
- package/dist/typeServer/programWrapper.js.map +1 -1
- package/dist/typeServer/protocol/tspSupplemental.d.ts +1 -1
- package/dist/typeServer/protocol/tspSupplemental.js +2 -2
- package/dist/typeServer/server.d.ts +13 -2
- package/dist/typeServer/server.js +36 -23
- package/dist/typeServer/server.js.map +1 -1
- package/dist/typeServer/typeCache.d.ts +8 -4
- package/dist/typeServer/typeCache.js +33 -5
- package/dist/typeServer/typeCache.js.map +1 -1
- package/dist/typeServer/typeEvalUtils.d.ts +2 -1
- package/dist/typeServer/typeEvalUtils.js +7 -3
- package/dist/typeServer/typeEvalUtils.js.map +1 -1
- package/dist/typeServer/typeGuards.js +3 -4
- package/dist/typeServer/typeGuards.js.map +1 -1
- package/dist/typeServer/typeServerFileSystem.d.ts +10 -9
- package/dist/typeServer/typeServerFileSystem.js +16 -12
- package/dist/typeServer/typeServerFileSystem.js.map +1 -1
- package/package.json +7 -5
- package/dist/analyzer/parseTreeCleaner.d.ts +0 -8
- package/dist/analyzer/parseTreeCleaner.js +0 -65
- package/dist/analyzer/parseTreeCleaner.js.map +0 -1
|
@@ -22,6 +22,8 @@ exports.tryRealpath = tryRealpath;
|
|
|
22
22
|
exports.getFileSystemEntries = getFileSystemEntries;
|
|
23
23
|
exports.getFileSystemEntriesWithSymlinkedDirectories = getFileSystemEntriesWithSymlinkedDirectories;
|
|
24
24
|
exports.getFileSystemEntriesFromDirEntries = getFileSystemEntriesFromDirEntries;
|
|
25
|
+
exports.containsWildcardCharacter = containsWildcardCharacter;
|
|
26
|
+
exports.getWildcardSegmentRegexFragment = getWildcardSegmentRegexFragment;
|
|
25
27
|
exports.getWildcardRegexPattern = getWildcardRegexPattern;
|
|
26
28
|
exports.getWildcardRoot = getWildcardRoot;
|
|
27
29
|
exports.hasPythonExtension = hasPythonExtension;
|
|
@@ -30,6 +32,7 @@ exports.getDirectoryChangeKind = getDirectoryChangeKind;
|
|
|
30
32
|
exports.deduplicateFolders = deduplicateFolders;
|
|
31
33
|
exports.getRootUri = getRootUri;
|
|
32
34
|
exports.convertUriToLspUriString = convertUriToLspUriString;
|
|
35
|
+
exports.isSameUriFile = isSameUriFile;
|
|
33
36
|
const caseSensitivityDetector_1 = require("../caseSensitivityDetector");
|
|
34
37
|
const pathUtils_1 = require("../pathUtils");
|
|
35
38
|
const serviceKeys_1 = require("../serviceKeys");
|
|
@@ -221,38 +224,51 @@ function getFileSystemEntriesWithSymlinkedDirectoriesFromDirEntries(dirEntries,
|
|
|
221
224
|
// Transforms a relative file spec (one that potentially contains
|
|
222
225
|
// escape characters **, * or ?) and returns a regular expression
|
|
223
226
|
// that can be used for matching against.
|
|
227
|
+
// Returns true if the given text contains a glob wildcard character (`*` or `?`).
|
|
228
|
+
function containsWildcardCharacter(text) {
|
|
229
|
+
return _wildcardRegex.test(text);
|
|
230
|
+
}
|
|
231
|
+
// Translates a single glob path segment (which may contain `*` or `?`, but not
|
|
232
|
+
// the `**` directory wildcard) into a regex fragment that matches a single path
|
|
233
|
+
// segment. This is the canonical per-segment translation used by both
|
|
234
|
+
// `getWildcardRegexPattern` (for `include`/`exclude`) and `extraPaths` glob
|
|
235
|
+
// expansion so the two stay in sync.
|
|
236
|
+
function getWildcardSegmentRegexFragment(segment) {
|
|
237
|
+
const escapedSeparator = (0, pathUtils_1.getRegexEscapedSeparator)('/');
|
|
238
|
+
const reservedCharacterPattern = new RegExp(`[^\\w\\s${escapedSeparator}]`, 'g');
|
|
239
|
+
return segment.replace(reservedCharacterPattern, (match) => {
|
|
240
|
+
if (match === '*') {
|
|
241
|
+
return `[^${escapedSeparator}]*`;
|
|
242
|
+
}
|
|
243
|
+
else if (match === '?') {
|
|
244
|
+
return `[^${escapedSeparator}]`;
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
// escaping anything that is not reserved characters - word/space/separator
|
|
248
|
+
return '\\' + match;
|
|
249
|
+
}
|
|
250
|
+
});
|
|
251
|
+
}
|
|
224
252
|
function getWildcardRegexPattern(root, fileSpec) {
|
|
225
253
|
const absolutePath = root.resolvePaths(fileSpec);
|
|
226
254
|
const pathComponents = Array.from(absolutePath.getPathComponents());
|
|
227
255
|
const escapedSeparator = (0, pathUtils_1.getRegexEscapedSeparator)('/');
|
|
228
256
|
const doubleAsteriskRegexFragment = `(${escapedSeparator}[^${escapedSeparator}][^${escapedSeparator}]*)*?`;
|
|
229
|
-
const reservedCharacterPattern = new RegExp(`[^\\w\\s${escapedSeparator}]`, 'g');
|
|
230
257
|
// Strip the directory separator from the root component.
|
|
231
258
|
if (pathComponents.length > 0) {
|
|
232
259
|
pathComponents[0] = (0, pathUtils_1.stripTrailingDirectorySeparator)(pathComponents[0]);
|
|
233
260
|
}
|
|
234
261
|
let regExPattern = '';
|
|
235
262
|
let firstComponent = true;
|
|
236
|
-
for (
|
|
263
|
+
for (const component of pathComponents) {
|
|
237
264
|
if (component === '**') {
|
|
238
265
|
regExPattern += doubleAsteriskRegexFragment;
|
|
239
266
|
}
|
|
240
267
|
else {
|
|
241
268
|
if (!firstComponent) {
|
|
242
|
-
|
|
269
|
+
regExPattern += escapedSeparator;
|
|
243
270
|
}
|
|
244
|
-
regExPattern += component
|
|
245
|
-
if (match === '*') {
|
|
246
|
-
return `[^${escapedSeparator}]*`;
|
|
247
|
-
}
|
|
248
|
-
else if (match === '?') {
|
|
249
|
-
return `[^${escapedSeparator}]`;
|
|
250
|
-
}
|
|
251
|
-
else {
|
|
252
|
-
// escaping anything that is not reserved characters - word/space/separator
|
|
253
|
-
return '\\' + match;
|
|
254
|
-
}
|
|
255
|
-
});
|
|
271
|
+
regExPattern += getWildcardSegmentRegexFragment(component);
|
|
256
272
|
firstComponent = false;
|
|
257
273
|
}
|
|
258
274
|
}
|
|
@@ -372,6 +388,40 @@ function convertUriToLspUriString(fs, uri) {
|
|
|
372
388
|
// Convert to a URI string that the LSP client understands (mapped files are only local to the server).
|
|
373
389
|
return fs.getOriginalUri(uri).toString();
|
|
374
390
|
}
|
|
391
|
+
// Determines whether two parsed URIs refer to the same logical file.
|
|
392
|
+
//
|
|
393
|
+
// In virtual workspaces the same physical file can be tracked under more than one
|
|
394
|
+
// URI (for example two `vscode-vfs://` URIs that differ only by authority). Comparing
|
|
395
|
+
// the raw URI strings treats these as distinct files and produces duplicate results
|
|
396
|
+
// (e.g. duplicated call hierarchy entries). This helper only merges the two shapes it
|
|
397
|
+
// can safely reconcile:
|
|
398
|
+
// - Two `file://` URIs are compared by their file-system path (`getFilePath`).
|
|
399
|
+
// - Two virtual URIs (whose file path is empty) are compared by their scheme, URI
|
|
400
|
+
// path (`getPath`), query, and fragment. Only the authority is ignored, so virtual
|
|
401
|
+
// URIs that differ only by authority merge, while URIs that differ by scheme or by
|
|
402
|
+
// query/fragment (for example notebook cell URIs that carry a `#cellName` fragment)
|
|
403
|
+
// stay distinct.
|
|
404
|
+
// Any other combination (including a `file://` URI paired with a virtual URI, whose
|
|
405
|
+
// paths are not directly comparable) returns false, so callers should apply an exact
|
|
406
|
+
// string comparison first and only consult this helper when the strings differ.
|
|
407
|
+
function isSameUriFile(uriA, uriB) {
|
|
408
|
+
const filePathA = uriA.getFilePath();
|
|
409
|
+
const filePathB = uriB.getFilePath();
|
|
410
|
+
if (filePathA && filePathB) {
|
|
411
|
+
return filePathA === filePathB;
|
|
412
|
+
}
|
|
413
|
+
if (!filePathA && !filePathB) {
|
|
414
|
+
const pathA = uriA.getPath();
|
|
415
|
+
const pathB = uriB.getPath();
|
|
416
|
+
if (pathA && pathB) {
|
|
417
|
+
return (uriA.scheme === uriB.scheme &&
|
|
418
|
+
pathA === pathB &&
|
|
419
|
+
uriA.query === uriB.query &&
|
|
420
|
+
uriA.fragment === uriB.fragment);
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
return false;
|
|
424
|
+
}
|
|
375
425
|
var UriEx;
|
|
376
426
|
(function (UriEx) {
|
|
377
427
|
function file(path, arg, checkRelative) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uriUtils.js","sourceRoot":"","sources":["../../../../../../src/common/uri/uriUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"uriUtils.js","sourceRoot":"","sources":["../../../../../../src/common/uri/uriUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { FileSystem } from './common/fileSystem';
|
|
2
|
+
type FileSystemMappingMethodName = 'existsSync' | 'readdirEntriesSync' | 'readFileSync' | 'statSync' | 'realpathSync' | 'createReadStream' | 'readFile' | 'readFileText' | 'isMappedUri' | 'getOriginalUri' | 'getMappedUri' | 'mapDirectory';
|
|
3
|
+
export interface FileSystemMapping extends Pick<FileSystem, FileSystemMappingMethodName> {
|
|
4
|
+
}
|
|
5
|
+
export interface FileSystemMappingState {
|
|
6
|
+
bind(fileSystem: FileSystem): FileSystemMapping;
|
|
7
|
+
}
|
|
8
|
+
export declare function createFileSystemMapping(realFS: FileSystem): FileSystemMapping;
|
|
9
|
+
export declare function createFileSystemMappingState(): FileSystemMappingState;
|
|
10
|
+
export {};
|
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* fileSystemMapping.ts
|
|
4
|
+
* Copyright (c) Microsoft Corporation.
|
|
5
|
+
* Licensed under the MIT license.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.createFileSystemMapping = createFileSystemMapping;
|
|
9
|
+
exports.createFileSystemMappingState = createFileSystemMappingState;
|
|
10
|
+
const fileSystem_1 = require("./common/fileSystem");
|
|
11
|
+
const uriMap_1 = require("./common/uri/uriMap");
|
|
12
|
+
const uriUtils_1 = require("./common/uri/uriUtils");
|
|
13
|
+
function createFileSystemMapping(realFS) {
|
|
14
|
+
return createFileSystemMappingState().bind(realFS);
|
|
15
|
+
}
|
|
16
|
+
function createFileSystemMappingState() {
|
|
17
|
+
return new FileSystemMappingStateImpl();
|
|
18
|
+
}
|
|
19
|
+
const noOriginalUriResolution = Symbol();
|
|
20
|
+
class FileSystemMappingStateImpl {
|
|
21
|
+
constructor() {
|
|
22
|
+
this._data = {
|
|
23
|
+
entryMap: new uriMap_1.UriMap(),
|
|
24
|
+
reverseEntryMap: new uriMap_1.UriMap(),
|
|
25
|
+
originalUriCache: new WeakMap(),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
bind(fileSystem) {
|
|
29
|
+
return new FileSystemMappingImpl(this._data, fileSystem);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
class FileSystemMappingImpl {
|
|
33
|
+
constructor(_data, _realFS) {
|
|
34
|
+
this._data = _data;
|
|
35
|
+
this._realFS = _realFS;
|
|
36
|
+
}
|
|
37
|
+
existsSync(uri) {
|
|
38
|
+
if (this._isOriginalPath(uri)) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
return this._realFS.existsSync(this._getInternalOriginalUri(uri));
|
|
42
|
+
}
|
|
43
|
+
readdirEntriesSync(uri) {
|
|
44
|
+
const entries = new Map();
|
|
45
|
+
for (const [key] of this._data.entryMap.entries()) {
|
|
46
|
+
if (key.isChild(uri) && key.getRelativePathComponents(uri).length === 1) {
|
|
47
|
+
entries.set(key.fileName, new fileSystem_1.VirtualDirent(key.fileName, false, uri.getFilePath()));
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const mappedEntry = this._getOriginalEntry(uri);
|
|
51
|
+
if (mappedEntry) {
|
|
52
|
+
const originalUri = this._getInternalOriginalUri(uri);
|
|
53
|
+
for (const entry of this._realFS.readdirEntriesSync(originalUri)) {
|
|
54
|
+
const originalEntryUri = originalUri.combinePaths(entry.name);
|
|
55
|
+
if (!mappedEntry.filter(originalEntryUri, this._realFS)) {
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
const target = entry.isFile() || entry.isDirectory() ? entry : (0, uriUtils_1.tryStat)(this._realFS, originalEntryUri);
|
|
59
|
+
if (!target || (!target.isFile() && !target.isDirectory())) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
entries.set(entry.name, new fileSystem_1.VirtualDirent(entry.name, target.isFile(), uri.getFilePath()));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if (this._realFS.existsSync(uri)) {
|
|
66
|
+
const filteredEntries = this._realFS
|
|
67
|
+
.readdirEntriesSync(uri)
|
|
68
|
+
.filter((entry) => !this._isOriginalPath(uri.combinePaths(entry.name)));
|
|
69
|
+
for (const entry of filteredEntries) {
|
|
70
|
+
entries.set(entry.name, entry);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return [...entries.values()];
|
|
74
|
+
}
|
|
75
|
+
readFileSync(uri, encoding) {
|
|
76
|
+
return this._realFS.readFileSync(this._getInternalOriginalUri(uri), encoding);
|
|
77
|
+
}
|
|
78
|
+
statSync(uri) {
|
|
79
|
+
if (this._isOriginalPath(uri)) {
|
|
80
|
+
throw new Error('ENOENT: path does not exist');
|
|
81
|
+
}
|
|
82
|
+
return this._realFS.statSync(this._getInternalOriginalUri(uri));
|
|
83
|
+
}
|
|
84
|
+
realpathSync(uri) {
|
|
85
|
+
if (this._data.entryMap.has(uri)) {
|
|
86
|
+
return uri;
|
|
87
|
+
}
|
|
88
|
+
return this._realFS.realpathSync(uri);
|
|
89
|
+
}
|
|
90
|
+
createReadStream(uri) {
|
|
91
|
+
return this._realFS.createReadStream(this._getInternalOriginalUri(uri));
|
|
92
|
+
}
|
|
93
|
+
readFile(uri) {
|
|
94
|
+
return this._realFS.readFile(this._getInternalOriginalUri(uri));
|
|
95
|
+
}
|
|
96
|
+
readFileText(uri, encoding) {
|
|
97
|
+
return this._realFS.readFileText(this._getInternalOriginalUri(uri), encoding);
|
|
98
|
+
}
|
|
99
|
+
isMappedUri(uri) {
|
|
100
|
+
if (this._getOriginalEntry(uri) !== undefined) {
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
return this._realFS.isMappedUri(uri);
|
|
104
|
+
}
|
|
105
|
+
getOriginalUri(mappedUri) {
|
|
106
|
+
return this._realFS.getOriginalUri(this._getInternalOriginalUri(mappedUri));
|
|
107
|
+
}
|
|
108
|
+
getMappedUri(originalUri) {
|
|
109
|
+
const entry = this._getMappedEntry(originalUri);
|
|
110
|
+
if (!entry) {
|
|
111
|
+
return this._realFS.getMappedUri(originalUri);
|
|
112
|
+
}
|
|
113
|
+
const relative = entry.originalUri.getRelativePathComponents(originalUri);
|
|
114
|
+
return entry.mappedUri.combinePaths(...relative);
|
|
115
|
+
}
|
|
116
|
+
mapDirectory(mappedUri, originalUri, filter) {
|
|
117
|
+
const entry = { originalUri, mappedUri, filter: filter ?? (() => true) };
|
|
118
|
+
this._data.entryMap.set(mappedUri, entry);
|
|
119
|
+
this._data.reverseEntryMap.set(originalUri, entry);
|
|
120
|
+
this._data.originalUriCache = new WeakMap();
|
|
121
|
+
return {
|
|
122
|
+
dispose: () => {
|
|
123
|
+
this._data.entryMap.delete(mappedUri);
|
|
124
|
+
this._data.reverseEntryMap.delete(originalUri);
|
|
125
|
+
this._data.originalUriCache = new WeakMap();
|
|
126
|
+
},
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
_findClosestMatch(uri, map) {
|
|
130
|
+
while (true) {
|
|
131
|
+
const entry = map.get(uri);
|
|
132
|
+
if (entry) {
|
|
133
|
+
return entry;
|
|
134
|
+
}
|
|
135
|
+
const parent = uri.getDirectory();
|
|
136
|
+
if (parent.equals(uri)) {
|
|
137
|
+
return undefined;
|
|
138
|
+
}
|
|
139
|
+
uri = parent;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
_getOriginalEntry(uri) {
|
|
143
|
+
return this._findClosestMatch(uri, this._data.entryMap);
|
|
144
|
+
}
|
|
145
|
+
_getInternalOriginalUri(uri) {
|
|
146
|
+
let resolution = this._data.originalUriCache.get(uri);
|
|
147
|
+
if (resolution === undefined) {
|
|
148
|
+
const entry = this._getOriginalEntry(uri);
|
|
149
|
+
if (!entry) {
|
|
150
|
+
this._data.originalUriCache.set(uri, noOriginalUriResolution);
|
|
151
|
+
return uri;
|
|
152
|
+
}
|
|
153
|
+
const relative = entry.mappedUri.getRelativePathComponents(uri);
|
|
154
|
+
resolution = { entry, originalUri: entry.originalUri.combinePaths(...relative) };
|
|
155
|
+
this._data.originalUriCache.set(uri, resolution);
|
|
156
|
+
}
|
|
157
|
+
if (resolution === noOriginalUriResolution) {
|
|
158
|
+
return uri;
|
|
159
|
+
}
|
|
160
|
+
if (resolution.entry.filter(resolution.originalUri, this._realFS)) {
|
|
161
|
+
return resolution.originalUri;
|
|
162
|
+
}
|
|
163
|
+
return uri;
|
|
164
|
+
}
|
|
165
|
+
_getMappedEntry(uri) {
|
|
166
|
+
const reverseMatch = this._findClosestMatch(uri, this._data.reverseEntryMap);
|
|
167
|
+
if (reverseMatch && reverseMatch.filter(uri, this._realFS)) {
|
|
168
|
+
return reverseMatch;
|
|
169
|
+
}
|
|
170
|
+
return undefined;
|
|
171
|
+
}
|
|
172
|
+
_isOriginalPath(uri) {
|
|
173
|
+
return this._getMappedEntry(uri) !== undefined;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
//# sourceMappingURL=fileSystemMapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fileSystemMapping.js","sourceRoot":"","sources":["../../../../src/fileSystemMapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,8 @@ function getEffectiveCommandLineOptions(workspaceRootUri, serverSettings, trackF
|
|
|
105
105
|
commandLineOptions.languageServerSettings.typeStubTargetImportName = typeStubTargetImportName;
|
|
106
106
|
}
|
|
107
107
|
commandLineOptions.configSettings.autoSearchPaths = serverSettings.autoSearchPaths;
|
|
108
|
-
commandLineOptions.configSettings.
|
|
108
|
+
commandLineOptions.configSettings.useDefaultExcludes = serverSettings.useDefaultExcludes;
|
|
109
|
+
commandLineOptions.configSettings.extraPaths = serverSettings.extraPathFileSpecs ?? [];
|
|
109
110
|
commandLineOptions.configSettings.diagnosticSeverityOverrides = serverSettings.diagnosticSeverityOverrides;
|
|
110
111
|
commandLineOptions.configSettings.diagnosticBooleanOverrides = serverSettings.diagnosticBooleanOverrides;
|
|
111
112
|
commandLineOptions.configSettings.includeFileSpecs = serverSettings.includeFileSpecs ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzerServiceExecutor.js","sourceRoot":"","sources":["../../../../../src/languageService/analyzerServiceExecutor.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAiFH,
|
|
1
|
+
{"version":3,"file":"analyzerServiceExecutor.js","sourceRoot":"","sources":["../../../../../src/languageService/analyzerServiceExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
43
43
|
exports.AutoImporter = void 0;
|
|
44
44
|
exports.buildModuleSymbolsMap = buildModuleSymbolsMap;
|
|
45
45
|
exports.convertSymbolKindToCompletionItemKind = convertSymbolKindToCompletionItemKind;
|
|
46
|
+
const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
|
|
46
47
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
47
48
|
const importStatementUtils_1 = require("../analyzer/importStatementUtils");
|
|
48
49
|
const sourceFileInfoUtils_1 = require("../analyzer/sourceFileInfoUtils");
|
|
@@ -51,6 +52,7 @@ const symbolUtils_1 = require("../analyzer/symbolUtils");
|
|
|
51
52
|
const cancellationUtils_1 = require("../common/cancellationUtils");
|
|
52
53
|
const collectionUtils_1 = require("../common/collectionUtils");
|
|
53
54
|
const pathUtils_1 = require("../common/pathUtils");
|
|
55
|
+
const positionUtils_1 = require("../common/positionUtils");
|
|
54
56
|
const StringUtils = __importStar(require("../common/stringUtils"));
|
|
55
57
|
const completionProvider_1 = require("./completionProvider");
|
|
56
58
|
const lspUtils_1 = require("../common/lspUtils");
|
|
@@ -122,7 +124,7 @@ class AutoImporter {
|
|
|
122
124
|
this.moduleSymbolMap = moduleSymbolMap;
|
|
123
125
|
this.options = options;
|
|
124
126
|
this._importStatements = (0, importStatementUtils_1.getTopLevelImports)(this.parseResults.parserOutput.parseTree,
|
|
125
|
-
/* includeImplicitImports */ true);
|
|
127
|
+
/* includeImplicitImports */ true, (0, analyzerNodeInfo_1.getInfoReader)(this.program));
|
|
126
128
|
}
|
|
127
129
|
getAutoImportCandidates(word, similarityLimit, abbrFromUsers, token) {
|
|
128
130
|
const results = [];
|
|
@@ -437,6 +439,23 @@ class AutoImporter {
|
|
|
437
439
|
_getModuleNameAndTypeFromFilePath(uri) {
|
|
438
440
|
return this.importResolver.getModuleNameForImport(uri, this.execEnvironment);
|
|
439
441
|
}
|
|
442
|
+
// Returns true when the given import statement appears before the invocation (usage)
|
|
443
|
+
// position. Merging a new symbol into an import statement that comes *after* the usage
|
|
444
|
+
// would leave the symbol unbound, so callers should only merge when this returns true.
|
|
445
|
+
//
|
|
446
|
+
// Known limitation: this is a purely lexical (offset) comparison with no execution-scope
|
|
447
|
+
// awareness. When the usage sits inside a deferred-execution scope (e.g. a function or
|
|
448
|
+
// lambda body) above a module-level same-module import, merging into that below import is
|
|
449
|
+
// actually safe at runtime because the function runs after the module finishes importing.
|
|
450
|
+
// In that case this returns false and we conservatively insert a separate import at the top
|
|
451
|
+
// instead of consolidating. We accept that as a rare, correctness-neutral trade-off, since
|
|
452
|
+
// detecting deferred-execution scopes reliably (function/lambda bodies vs class bodies,
|
|
453
|
+
// default-arg/decorator positions, comprehensions, etc.) is error-prone and not worth the
|
|
454
|
+
// risk relative to the unbound-symbol bug this guard prevents.
|
|
455
|
+
_isImportBeforeInvocation(importStatement) {
|
|
456
|
+
const invocationOffset = (0, positionUtils_1.convertPositionToOffset)(this._invocationPosition, this.parseResults.tokenizerOutput.lines);
|
|
457
|
+
return invocationOffset === undefined || invocationOffset > importStatement.node.start;
|
|
458
|
+
}
|
|
440
459
|
_getTextEditsForAutoImportByFilePath(importNameInfo, moduleNameInfo, insertionText, importGroup, fileUri) {
|
|
441
460
|
// If there is no symbolName, there can't be existing import statement.
|
|
442
461
|
const importStatement = this._importStatements.mapByFilePath.get(fileUri.key);
|
|
@@ -479,9 +498,13 @@ class AutoImporter {
|
|
|
479
498
|
};
|
|
480
499
|
}
|
|
481
500
|
// If not, add what we want at the existing 'import from' statement as long as
|
|
482
|
-
// what is imported is not module itself
|
|
501
|
+
// what is imported is not module itself, and the existing statement appears
|
|
502
|
+
// before the usage. Merging into a statement that is located *after* the usage
|
|
503
|
+
// would leave the symbol unbound, so in that case we fall through to inserting
|
|
504
|
+
// a new import statement in the correct location.
|
|
483
505
|
// ex) don't add "path" to existing "from os.path import dirname" statement.
|
|
484
|
-
if (moduleNameInfo.name === importStatement.moduleName
|
|
506
|
+
if (moduleNameInfo.name === importStatement.moduleName &&
|
|
507
|
+
this._isImportBeforeInvocation(importStatement)) {
|
|
485
508
|
return {
|
|
486
509
|
insertionText: importNameInfo.alias ?? insertionText,
|
|
487
510
|
edits: this.options.lazyEdit
|
|
@@ -508,8 +531,12 @@ class AutoImporter {
|
|
|
508
531
|
};
|
|
509
532
|
}
|
|
510
533
|
}
|
|
511
|
-
else {
|
|
512
|
-
// If not, add what we want at the existing import from statement
|
|
534
|
+
else if (this._isImportBeforeInvocation(imported)) {
|
|
535
|
+
// If not, add what we want at the existing import from statement, as long as
|
|
536
|
+
// that statement appears before the usage. Merging into a statement located
|
|
537
|
+
// *after* the usage would leave the symbol unbound, so in that case we skip
|
|
538
|
+
// this merge and continue below to the implicit-imports check, only inserting
|
|
539
|
+
// a new import statement if no implicit import matches.
|
|
513
540
|
return {
|
|
514
541
|
insertionText: importNameInfo.alias ?? insertionText,
|
|
515
542
|
edits: this.options.lazyEdit
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autoImporter.js","sourceRoot":"","sources":["../../../../../src/languageService/autoImporter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"autoImporter.js","sourceRoot":"","sources":["../../../../../src/languageService/autoImporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,12 @@ import { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall
|
|
|
3
3
|
import { ProgramView } from '../common/extensibility';
|
|
4
4
|
import { Position } from '../common/textRange';
|
|
5
5
|
import { Uri } from '../common/uri/uri';
|
|
6
|
+
export declare const callHierarchyDetails: {
|
|
7
|
+
readonly library: string;
|
|
8
|
+
readonly standardLibrary: string;
|
|
9
|
+
readonly workspace: string;
|
|
10
|
+
};
|
|
11
|
+
export declare function getCallHierarchyDetail(isThirdPartyImport: boolean, isTypeshedFile: boolean, isOwned: boolean): string | undefined;
|
|
6
12
|
export declare class CallHierarchyProvider {
|
|
7
13
|
private _program;
|
|
8
14
|
private _fileUri;
|
|
@@ -18,3 +24,4 @@ export declare class CallHierarchyProvider {
|
|
|
18
24
|
private _getIncomingCallsForDeclaration;
|
|
19
25
|
private _getDeclaration;
|
|
20
26
|
}
|
|
27
|
+
export declare function combineCallHierarchyDetail(symbolDetail: string | undefined, originDetail: string | undefined): string | undefined;
|