@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231210

package/dist/tests/harness/fourslash/fourSlashParser.js

@@ -48,10 +48,10 @@ function parseTestData(basePath, contents, fileName) {
             return;
         }
         if ((0, core_1.toBoolean)(currentFileOptions["library" /* MetadataOptionNames.library */])) {
-            currentFileName = (0, pathUtils_1.normalizePath)((0, pathUtils_1.combinePaths)(factory_1.libFolder, (0, pathUtils_1.getRelativePath)(currentFileName, normalizedBasePath)));
+            currentFileName = (0, pathUtils_1.normalizePath)((0, pathUtils_1.combinePaths)(factory_1.libFolder.getFilePath(), (0, pathUtils_1.getRelativePath)(currentFileName, normalizedBasePath)));
         }
         if ((0, core_1.toBoolean)(currentFileOptions["distlibrary" /* MetadataOptionNames.distLibrary */])) {
-            currentFileName = (0, pathUtils_1.normalizePath)((0, pathUtils_1.combinePaths)(factory_1.distlibFolder, (0, pathUtils_1.getRelativePath)(currentFileName, normalizedBasePath)));
+            currentFileName = (0, pathUtils_1.normalizePath)((0, pathUtils_1.combinePaths)(factory_1.distlibFolder.getFilePath(), (0, pathUtils_1.getRelativePath)(currentFileName, normalizedBasePath)));
         }
         const file = parseFileContent(currentFileContent, currentFileName, markerPositions, markers, ranges);
         file.fileOptions = currentFileOptions;

package/dist/tests/harness/fourslash/fourSlashParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"fourSlashParser.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/fourSlashParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fourSlashParser.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/fourSlashParser.ts"],"names":[],"mappings":"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"}

package/dist/tests/harness/fourslash/testLanguageService.d.ts

@@ -5,6 +5,7 @@ import { BackgroundAnalysisBase } from '../../../backgroundAnalysisBase';
 import { ConsoleInterface } from '../../../common/console';
 import { FileSystem } from '../../../common/fileSystem';
 import { Range } from '../../../common/textRange';
+import { Uri } from '../../../common/uri/uri';
 import { LanguageServerInterface, MessageAction, ServerSettings, WindowInterface } from '../../../languageServerBase';
 import { Workspace } from '../../../workspaceFactory';
 import { HostSpecificFeatures } from './testState';
@@ -12,22 +13,20 @@ export declare class TestFeatures implements HostSpecificFeatures {
     importResolverFactory: ImportResolverFactory;
     backgroundAnalysisProgramFactory: BackgroundAnalysisProgramFactory;
     runIndexer(workspace: Workspace, noStdLib: boolean, options?: string): void;
-    getCodeActionsForPosition(workspace: Workspace, filePath: string, range: Range, token: CancellationToken): Promise<CodeAction[]>;
+    getCodeActionsForPosition(workspace: Workspace, fileUri: Uri, range: Range, token: CancellationToken): Promise<CodeAction[]>;
     execute(ls: LanguageServerInterface, params: ExecuteCommandParams, token: CancellationToken): Promise<any>;
 }
 export declare class TestLanguageService implements LanguageServerInterface {
     readonly console: ConsoleInterface;
     readonly fs: FileSystem;
-    readonly rootPath: string;
+    readonly rootUri: Uri;
     readonly window: TestWindow;
     readonly supportAdvancedEdits = true;
     private readonly _workspace;
     private readonly _defaultWorkspace;
-    private readonly _uriParser;
     constructor(workspace: Workspace, console: ConsoleInterface, fs: FileSystem);
-    decodeTextDocumentUri(uriString: string): string;
     getWorkspaces(): Promise<Workspace[]>;
-    getWorkspaceForFile(filePath: string): Promise<Workspace>;
+    getWorkspaceForFile(uri: Uri): Promise<Workspace>;
     getSettings(_workspace: Workspace): Promise<ServerSettings>;
     createBackgroundAnalysis(serviceId: string): BackgroundAnalysisBase | undefined;
     reanalyze(): void;

package/dist/tests/harness/fourslash/testLanguageService.js

@@ -31,17 +31,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestLanguageService = exports.TestFeatures = void 0;
-const path = __importStar(require("path"));
 const backgroundAnalysisProgram_1 = require("../../../analyzer/backgroundAnalysisProgram");
 const service_1 = require("../../../analyzer/service");
 const commandController_1 = require("../../../commands/commandController");
 const configOptions_1 = require("../../../common/configOptions");
 const debug = __importStar(require("../../../common/debug"));
-const uriParser_1 = require("../../../common/uriParser");
+const serviceProvider_1 = require("../../../common/serviceProvider");
+const uri_1 = require("../../../common/uri/uri");
 const codeActionProvider_1 = require("../../../languageService/codeActionProvider");
 const workspaceFactory_1 = require("../../../workspaceFactory");
 const testAccessHost_1 = require("../testAccessHost");
-const serviceProvider_1 = require("../../../common/serviceProvider");
 class TestFeatures {
     constructor() {
         this.importResolverFactory = service_1.AnalyzerService.createImportResolver;
@@ -51,8 +50,8 @@ class TestFeatures {
     runIndexer(workspace, noStdLib, options) {
         /* empty */
     }
-    getCodeActionsForPosition(workspace, filePath, range, token) {
-        return codeActionProvider_1.CodeActionProvider.getCodeActionsForPosition(workspace, filePath, range, undefined, token);
+    getCodeActionsForPosition(workspace, fileUri, range, token) {
+        return codeActionProvider_1.CodeActionProvider.getCodeActionsForPosition(workspace, fileUri, range, undefined, token);
     }
     execute(ls, params, token) {
         const controller = new commandController_1.CommandController(ls);
@@ -64,15 +63,13 @@ class TestLanguageService {
     constructor(workspace, console, fs) {
         this.console = console;
         this.fs = fs;
-        this.rootPath = path.sep;
+        this.rootUri = uri_1.Uri.file('/');
         this.window = new TestWindow();
         this.supportAdvancedEdits = true;
         this._workspace = workspace;
-        this._uriParser = new uriParser_1.UriParser(this.fs);
         this._defaultWorkspace = {
             workspaceName: '',
-            rootPath: '',
-            uri: '',
+            rootUri: uri_1.Uri.empty(),
             pythonPath: undefined,
             pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
             kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
@@ -80,7 +77,7 @@ class TestLanguageService {
                 console: this.console,
                 hostFactory: () => new testAccessHost_1.TestAccessHost(),
                 importResolverFactory: service_1.AnalyzerService.createImportResolver,
-                configOptions: new configOptions_1.ConfigOptions('.'),
+                configOptions: new configOptions_1.ConfigOptions(uri_1.Uri.empty()),
                 fileSystem: this.fs,
             }),
             disableLanguageServices: false,
@@ -91,14 +88,11 @@ class TestLanguageService {
             pythonEnvironmentName: undefined,
         };
     }
-    decodeTextDocumentUri(uriString) {
-        return this._uriParser.decodeTextDocumentUri(uriString);
-    }
     getWorkspaces() {
         return Promise.resolve([this._workspace, this._defaultWorkspace]);
     }
-    getWorkspaceForFile(filePath) {
-        if (filePath.startsWith(this._workspace.rootPath)) {
+    getWorkspaceForFile(uri) {
+        if (uri.startsWith(this._workspace.rootUri)) {
             return Promise.resolve(this._workspace);
         }
         return Promise.resolve(this._defaultWorkspace);

package/dist/tests/harness/fourslash/testLanguageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"testLanguageService.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/testLanguageService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testLanguageService.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/testLanguageService.ts"],"names":[],"mappings":"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"}

package/dist/tests/harness/fourslash/testState.d.ts

@@ -8,6 +8,7 @@ import { FileEditAction } from '../../../common/editAction';
 import { ReadOnlyFileSystem } from '../../../common/fileSystem';
 import { ServiceProvider } from '../../../common/serviceProvider';
 import { DocumentRange, Position, Range as PositionRange, TextRange } from '../../../common/textRange';
+import { Uri } from '../../../common/uri/uri';
 import { LanguageServerInterface } from '../../../languageServerBase';
 import { DefinitionFilter } from '../../../languageService/definitionProvider';
 import { CollectionResult } from '../../../languageService/documentSymbolCollector';
@@ -25,7 +26,7 @@ export interface HostSpecificFeatures {
     importResolverFactory: ImportResolverFactory;
     backgroundAnalysisProgramFactory: BackgroundAnalysisProgramFactory;
     runIndexer(workspace: Workspace, noStdLib: boolean, options?: string): void;
-    getCodeActionsForPosition(workspace: Workspace, filePath: string, range: PositionRange, token: CancellationToken): Promise<CodeAction[]>;
+    getCodeActionsForPosition(workspace: Workspace, fileUri: Uri, range: PositionRange, token: CancellationToken): Promise<CodeAction[]>;
     execute(ls: LanguageServerInterface, params: ExecuteCommandParams, token: CancellationToken): Promise<any>;
 }
 export declare class TestState {
@@ -73,8 +74,6 @@ export declare class TestState {
         };
     };
     convertPositionRange(range: Range): PositionRange;
-    convertPathToUri(path: string): string;
-    getDirectoryPath(path: string): string;
     getPathSep(): string;
     goToPosition(positionOrLineAndColumn: number | Position): void;
     select(startMarker: string, endMarker: string): void;
@@ -163,7 +162,7 @@ export declare class TestState {
         [marker: string]: {
             references: DocumentRange[];
         };
-    }, createDocumentRange?: (filePath: string, result: CollectionResult, parseResults: ParseResults) => DocumentRange, convertToLocation?: (fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined): void;
+    }, createDocumentRange?: (fileUri: Uri, result: CollectionResult, parseResults: ParseResults) => DocumentRange, convertToLocation?: (fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined): void;
     verifyShowCallHierarchyGetIncomingCalls(map: {
         [marker: string]: {
             items: _.FourSlashCallHierarchyItem[];
@@ -180,6 +179,7 @@ export declare class TestState {
             references: DocumentHighlight[];
         };
     }): void;
+    fixupDefinitionsToMatchExpected(actual: DocumentRange[] | undefined): any;
     verifyFindDefinitions(map: {
         [marker: string]: {
             definitions: DocumentRange[];