@zzzen/pyright-internal 1.2.0-dev.20240804 → 1.2.0-dev.20240818

package/dist/analyzer/scopeUtils.js

@@ -9,7 +9,11 @@
  * symbol tables.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isScopeContainedWithin = exports.findTopNodeInScope = exports.getScopeHierarchy = exports.getScopeForNode = exports.getBuiltInScope = void 0;
+exports.getBuiltInScope = getBuiltInScope;
+exports.getScopeForNode = getScopeForNode;
+exports.getScopeHierarchy = getScopeHierarchy;
+exports.findTopNodeInScope = findTopNodeInScope;
+exports.isScopeContainedWithin = isScopeContainedWithin;
 const analyzerNodeInfo_1 = require("./analyzerNodeInfo");
 const parseTreeUtils_1 = require("./parseTreeUtils");
 function getBuiltInScope(currentScope) {
@@ -21,13 +25,11 @@ function getBuiltInScope(currentScope) {
     }
     return builtInScope;
 }
-exports.getBuiltInScope = getBuiltInScope;
 // Locates the evaluation scope associated with the specified parse node.
 function getScopeForNode(node) {
     const scopeNode = (0, parseTreeUtils_1.getEvaluationScopeNode)(node).node;
     return (0, analyzerNodeInfo_1.getScope)(scopeNode);
 }
-exports.getScopeForNode = getScopeForNode;
 // Returns a list of scopes associated with the node and its ancestor nodes.
 // If stopScope is provided, the search will stop at that scope.
 // Returns undefined if stopScope is not found.
@@ -50,7 +52,6 @@ function getScopeHierarchy(node, stopScope) {
     }
     return stopScope ? undefined : scopeHierarchy;
 }
-exports.getScopeHierarchy = getScopeHierarchy;
 // Walks up the parse tree from the specified node to find the top-most node
 // that is within specified scope.
 function findTopNodeInScope(node, scope) {
@@ -69,7 +70,6 @@ function findTopNodeInScope(node, scope) {
     }
     return undefined;
 }
-exports.findTopNodeInScope = findTopNodeInScope;
 function isScopeContainedWithin(scope, potentialParentScope) {
     let curScope = scope;
     while (curScope) {
@@ -80,5 +80,4 @@ function isScopeContainedWithin(scope, potentialParentScope) {
     }
     return false;
 }
-exports.isScopeContainedWithin = isScopeContainedWithin;
 //# sourceMappingURL=scopeUtils.js.map

package/dist/analyzer/scopeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/scopeUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAGH,yDAA8C;AAC9C,qDAA0D;AAG1D,SAAgB,eAAe,CAAC,YAAmB;IAC/C,uEAAuE;IACvE,0BAA0B;IAC1B,IAAI,YAAY,GAAG,YAAY,CAAC;IAEhC,OAAO,YAAY,CAAC,IAAI,8BAAsB,EAAE;QAC5C,YAAY,GAAG,YAAY,CAAC,MAAO,CAAC;KACvC;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAVD,0CAUC;AAED,yEAAyE;AACzE,SAAgB,eAAe,CAAC,IAAe;IAC3C,MAAM,SAAS,GAAG,IAAA,uCAAsB,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACpD,OAAO,IAAA,2BAAQ,EAAC,SAAS,CAAC,CAAC;AAC/B,CAAC;AAHD,0CAGC;AAED,4EAA4E;AAC5E,gEAAgE;AAChE,+CAA+C;AAC/C,SAAgB,iBAAiB,CAAC,IAAe,EAAE,SAAiB;IAChE,MAAM,cAAc,GAAY,EAAE,CAAC;IACnC,IAAI,OAAO,GAA0B,IAAI,CAAC;IAE1C,OAAO,OAAO,EAAE;QACZ,MAAM,SAAS,GAAwB,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC;QAC5E,MAAM,QAAQ,GAAG,IAAA,2BAAQ,EAAC,SAAS,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ,EAAE;YACvF,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACjC;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,OAAO,cAAc,CAAC;SACzB;QAED,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC;KAC9B;IAED,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;AAClD,CAAC;AAxBD,8CAwBC;AAED,4EAA4E;AAC5E,kCAAkC;AAClC,SAAgB,kBAAkB,CAAC,IAAe,EAAE,KAAY;IAC5D,IAAI,OAAO,GAA0B,IAAI,CAAC;IAC1C,IAAI,QAA+B,CAAC;IACpC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,OAAO,OAAO,EAAE;QACZ,IAAI,IAAA,2BAAQ,EAAC,OAAO,CAAC,KAAK,KAAK,EAAE;YAC7B,UAAU,GAAG,IAAI,CAAC;SACrB;aAAM,IAAI,UAAU,EAAE;YACnB,OAAO,QAAQ,CAAC;SACnB;QAED,QAAQ,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;KAC5B;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAjBD,gDAiBC;AAED,SAAgB,sBAAsB,CAAC,KAAY,EAAE,oBAA2B;IAC5E,IAAI,QAAQ,GAAsB,KAAK,CAAC;IAExC,OAAO,QAAQ,EAAE;QACb,IAAI,QAAQ,CAAC,MAAM,KAAK,oBAAoB,EAAE;YAC1C,OAAO,IAAI,CAAC;SACf;QAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;KAC9B;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAZD,wDAYC"}
+{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/scopeUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;AAOH,0CAUC;AAGD,0CAGC;AAKD,8CAwBC;AAID,gDAiBC;AAED,wDAYC;AApFD,yDAA8C;AAC9C,qDAA0D;AAG1D,SAAgB,eAAe,CAAC,YAAmB;IAC/C,uEAAuE;IACvE,0BAA0B;IAC1B,IAAI,YAAY,GAAG,YAAY,CAAC;IAEhC,OAAO,YAAY,CAAC,IAAI,8BAAsB,EAAE,CAAC;QAC7C,YAAY,GAAG,YAAY,CAAC,MAAO,CAAC;IACxC,CAAC;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,yEAAyE;AACzE,SAAgB,eAAe,CAAC,IAAe;IAC3C,MAAM,SAAS,GAAG,IAAA,uCAAsB,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACpD,OAAO,IAAA,2BAAQ,EAAC,SAAS,CAAC,CAAC;AAC/B,CAAC;AAED,4EAA4E;AAC5E,gEAAgE;AAChE,+CAA+C;AAC/C,SAAgB,iBAAiB,CAAC,IAAe,EAAE,SAAiB;IAChE,MAAM,cAAc,GAAY,EAAE,CAAC;IACnC,IAAI,OAAO,GAA0B,IAAI,CAAC;IAE1C,OAAO,OAAO,EAAE,CAAC;QACb,MAAM,SAAS,GAAwB,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC;QAC5E,MAAM,QAAQ,GAAG,IAAA,2BAAQ,EAAC,SAAS,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;YACxF,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,cAAc,CAAC;QAC1B,CAAC;QAED,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;AAClD,CAAC;AAED,4EAA4E;AAC5E,kCAAkC;AAClC,SAAgB,kBAAkB,CAAC,IAAe,EAAE,KAAY;IAC5D,IAAI,OAAO,GAA0B,IAAI,CAAC;IAC1C,IAAI,QAA+B,CAAC;IACpC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,OAAO,OAAO,EAAE,CAAC;QACb,IAAI,IAAA,2BAAQ,EAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC;YAC9B,UAAU,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,UAAU,EAAE,CAAC;YACpB,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,QAAQ,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,sBAAsB,CAAC,KAAY,EAAE,oBAA2B;IAC5E,IAAI,QAAQ,GAAsB,KAAK,CAAC;IAExC,OAAO,QAAQ,EAAE,CAAC;QACd,IAAI,QAAQ,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/dist/analyzer/service.d.ts

@@ -119,6 +119,9 @@ export declare class AnalyzerService {
     private get _verboseOutput();
     private get _typeStubTargetImportName();
     private _getConfigOptions;
+    private _ensureDefaultOptions;
+    private _applyLanguageServerOptions;
+    private _applyCommandLineOverrides;
     private _getExtendedConfigurations;
     private _getTypeStubFolder;
     private _parseJsonConfigFile;

package/dist/analyzer/service.js

@@ -32,7 +32,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnalyzerService = exports.getNextServiceId = void 0;
+exports.AnalyzerService = void 0;
+exports.getNextServiceId = getNextServiceId;
 const TOML = __importStar(require("@iarna/toml"));
 const JSONC = __importStar(require("jsonc-parser"));
 const cancellationUtils_1 = require("../common/cancellationUtils");
@@ -62,7 +63,6 @@ let _nextServiceId = 1;
 function getNextServiceId(name) {
     return `${name}_${_nextServiceId++}`;
 }
-exports.getNextServiceId = getNextServiceId;
 class AnalyzerService {
     constructor(instanceName, serviceProvider, options) {
         var _a, _b, _c, _d, _e;
@@ -331,31 +331,31 @@ class AnalyzerService {
     }
     get _watchForSourceChanges() {
         var _a;
-        return !!((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.watchForSourceChanges);
+        return !!((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.languageServerSettings.watchForSourceChanges);
     }
     get _watchForLibraryChanges() {
         var _a;
-        return !!((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.watchForLibraryChanges) && !!this._options.libraryReanalysisTimeProvider;
+        return (!!((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.languageServerSettings.watchForLibraryChanges) &&
+            !!this._options.libraryReanalysisTimeProvider);
     }
     get _watchForConfigChanges() {
         var _a;
-        return !!((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.watchForConfigChanges);
+        return !!((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.languageServerSettings.watchForConfigChanges);
     }
     get _typeCheckingMode() {
         var _a;
-        return (_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.typeCheckingMode;
+        return (_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.configSettings.typeCheckingMode;
     }
     get _verboseOutput() {
         return !!this._configOptions.verboseOutput;
     }
     get _typeStubTargetImportName() {
         var _a;
-        return (_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.typeStubTargetImportName;
+        return (_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.languageServerSettings.typeStubTargetImportName;
     }
     // Calculates the effective options based on the command-line options,
     // an optional config file, and default values.
     _getConfigOptions(host, commandLineOptions) {
-        var _a, _b, _c, _d;
         const optionRoot = commandLineOptions.executionRoot;
         const executionRootUri = uri_1.Uri.is(optionRoot)
             ? optionRoot
@@ -397,7 +397,7 @@ class AnalyzerService {
             // If pyright is being executed from the command line, the working
             // directory may be deep within a project, and we need to walk up the
             // directory hierarchy to find the project root.
-            if (!configFilePath && !commandLineOptions.fromVsCodeExtension) {
+            if (!configFilePath && !commandLineOptions.fromLanguageServer) {
                 configFilePath = (0, serviceUtils_1.findConfigFileHereOrUp)(this.fs, projectRoot);
             }
             if (configFilePath) {
@@ -411,7 +411,7 @@ class AnalyzerService {
         if (!configFilePath) {
             // See if we can find a pyproject.toml file in this directory.
             pyprojectFilePath = (0, serviceUtils_1.findPyprojectTomlFile)(this.fs, projectRoot);
-            if (!pyprojectFilePath && !commandLineOptions.fromVsCodeExtension) {
+            if (!pyprojectFilePath && !commandLineOptions.fromLanguageServer) {
                 pyprojectFilePath = (0, serviceUtils_1.findPyprojectTomlFileHereOrUp)(this.fs, projectRoot);
             }
             if (pyprojectFilePath) {
@@ -423,42 +423,40 @@ class AnalyzerService {
             }
         }
         const configOptions = new configOptions_1.ConfigOptions(projectRoot);
-        configOptions.initializeTypeCheckingMode(this._typeCheckingMode, commandLineOptions.diagnosticSeverityOverrides);
-        const defaultExcludes = ['**/node_modules', '**/__pycache__', '**/.*'];
-        if (commandLineOptions.pythonPath) {
-            this._console.info(`Setting pythonPath for service "${this._instanceName}": ` + `"${commandLineOptions.pythonPath}"`);
-            configOptions.pythonPath = this.fs.realCasePath(uri_1.Uri.file(commandLineOptions.pythonPath, this.serviceProvider, /* checkRelative */ true));
-        }
-        if (commandLineOptions.pythonEnvironmentName) {
-            this._console.info(`Setting environmentName for service "${this._instanceName}": ` +
-                `"${commandLineOptions.pythonEnvironmentName}"`);
-            configOptions.pythonEnvironmentName = commandLineOptions.pythonEnvironmentName;
-        }
-        // The pythonPlatform and pythonVersion from the command-line can be overridden
-        // by the config file, so initialize them upfront.
-        configOptions.defaultPythonPlatform = commandLineOptions.pythonPlatform;
-        configOptions.defaultPythonVersion = commandLineOptions.pythonVersion;
-        configOptions.ensureDefaultExtraPaths(this.fs, (_a = commandLineOptions.autoSearchPaths) !== null && _a !== void 0 ? _a : false, commandLineOptions.extraPaths);
-        commandLineOptions.includeFileSpecs.forEach((fileSpec) => {
-            configOptions.include.push((0, uriUtils_1.getFileSpec)(projectRoot, fileSpec));
-        });
-        commandLineOptions.excludeFileSpecs.forEach((fileSpec) => {
-            configOptions.exclude.push((0, uriUtils_1.getFileSpec)(projectRoot, fileSpec));
-        });
-        commandLineOptions.ignoreFileSpecs.forEach((fileSpec) => {
-            configOptions.ignore.push((0, uriUtils_1.getFileSpec)(projectRoot, fileSpec));
-        });
-        configOptions.disableTaggedHints = !!commandLineOptions.disableTaggedHints;
-        configOptions.initializeTypeCheckingMode((_b = commandLineOptions.typeCheckingMode) !== null && _b !== void 0 ? _b : 'standard');
+        // If we found a config file, load it and apply its settings.
         const configs = this._getExtendedConfigurations(configFilePath !== null && configFilePath !== void 0 ? configFilePath : pyprojectFilePath);
         if (configs && configs.length > 0) {
+            // With a pyrightconfig.json set, we want the typeCheckingMode to always be standard
+            // as that's what the Pyright CLI will expect. Command line options (if not a language server) and
+            // the config file can override this.
+            configOptions.initializeTypeCheckingMode('standard');
+            // Then we apply the config file settings. This can update the
+            // the typeCheckingMode.
             for (const config of configs) {
-                configOptions.initializeFromJson(config.configFileJsonObj, config.configFileDirUri, this.serviceProvider, host, commandLineOptions);
+                configOptions.initializeFromJson(config.configFileJsonObj, config.configFileDirUri, this.serviceProvider, host);
+            }
+            // When not in language server mode, command line options override config file options.
+            if (!commandLineOptions.fromLanguageServer) {
+                this._applyCommandLineOverrides(configOptions, commandLineOptions.configSettings, projectRoot, false);
             }
         }
         else {
-            configOptions.applyDiagnosticOverrides(commandLineOptions.diagnosticSeverityOverrides);
-        }
+            // Initialize the type checking mode based on if this is for a language server or not. Language
+            // servers default to 'off' when no config file is found.
+            configOptions.initializeTypeCheckingMode(commandLineOptions.fromLanguageServer ? 'off' : 'standard');
+            // If there are no config files, we can then directly apply the command line options.
+            this._applyCommandLineOverrides(configOptions, commandLineOptions.configSettings, projectRoot, commandLineOptions.fromLanguageServer);
+        }
+        // Apply the command line options that are not in the config file. These settings
+        // only apply to the language server.
+        this._applyLanguageServerOptions(configOptions, commandLineOptions.languageServerSettings);
+        // Ensure that if no command line or config options were applied, we have some defaults.
+        this._ensureDefaultOptions(host, configOptions, projectRoot, executionRoot, commandLineOptions);
+        return configOptions;
+    }
+    _ensureDefaultOptions(host, configOptions, projectRoot, executionRoot, commandLineOptions) {
+        var _a, _b;
+        const defaultExcludes = ['**/node_modules', '**/__pycache__', '**/.*'];
         // If no include paths were provided, assume that all files within
         // the project should be included.
         if (configOptions.include.length === 0) {
@@ -476,44 +474,14 @@ class AnalyzerService {
                 configOptions.autoExcludeVenv = true;
             }
         }
-        // Override the analyzeUnannotatedFunctions setting based on the command-line setting.
-        if (commandLineOptions.analyzeUnannotatedFunctions !== undefined) {
-            configOptions.diagnosticRuleSet.analyzeUnannotatedFunctions =
-                commandLineOptions.analyzeUnannotatedFunctions;
+        if (!configOptions.defaultExtraPaths) {
+            configOptions.ensureDefaultExtraPaths(this.fs, (_a = commandLineOptions.configSettings.autoSearchPaths) !== null && _a !== void 0 ? _a : false, commandLineOptions.configSettings.extraPaths);
         }
-        // Override the include based on command-line settings.
-        if (commandLineOptions.includeFileSpecsOverride) {
-            configOptions.include = [];
-            commandLineOptions.includeFileSpecsOverride.forEach((include) => {
-                configOptions.include.push((0, uriUtils_1.getFileSpec)(uri_1.Uri.file(include, this.serviceProvider, /* checkRelative */ true), '.'));
-            });
+        if (configOptions.defaultPythonPlatform === undefined) {
+            configOptions.defaultPythonPlatform = commandLineOptions.configSettings.pythonPlatform;
         }
-        const reportDuplicateSetting = (settingName, configValue) => {
-            const settingSource = commandLineOptions.fromVsCodeExtension
-                ? 'the client settings'
-                : 'a command-line option';
-            this._console.warn(`The ${settingName} has been specified in both the config file and ` +
-                `${settingSource}. The value in the config file (${configValue}) ` +
-                `will take precedence`);
-        };
-        // Apply the command-line options if the corresponding
-        // item wasn't already set in the config file. Report any
-        // duplicates.
-        if (commandLineOptions.venvPath) {
-            if (!configOptions.venvPath) {
-                configOptions.venvPath = projectRoot.resolvePaths(commandLineOptions.venvPath);
-            }
-            else {
-                reportDuplicateSetting('venvPath', configOptions.venvPath.toUserVisibleString());
-            }
-        }
-        if (commandLineOptions.typeshedPath) {
-            if (!configOptions.typeshedPath) {
-                configOptions.typeshedPath = projectRoot.resolvePaths(commandLineOptions.typeshedPath);
-            }
-            else {
-                reportDuplicateSetting('typeshedPath', configOptions.typeshedPath.toUserVisibleString());
-            }
+        if (configOptions.defaultPythonVersion === undefined) {
+            configOptions.defaultPythonVersion = commandLineOptions.configSettings.pythonVersion;
         }
         // If the caller specified that "typeshedPath" is the root of the project,
         // then we're presumably running in the typeshed project itself. Auto-exclude
@@ -528,33 +496,10 @@ class AnalyzerService {
                 configOptions.exclude.push((0, uriUtils_1.getFileSpec)(executionRoot, exclude.getFilePath()));
             });
         }
-        configOptions.verboseOutput = (_c = commandLineOptions.verboseOutput) !== null && _c !== void 0 ? _c : configOptions.verboseOutput;
-        configOptions.checkOnlyOpenFiles = !!commandLineOptions.checkOnlyOpenFiles;
-        configOptions.autoImportCompletions = !!commandLineOptions.autoImportCompletions;
-        configOptions.indexing = !!commandLineOptions.indexing;
-        configOptions.taskListTokens = commandLineOptions.taskListTokens;
-        configOptions.logTypeEvaluationTime = !!commandLineOptions.logTypeEvaluationTime;
-        configOptions.typeEvaluationTimeThreshold = commandLineOptions.typeEvaluationTimeThreshold;
-        // If useLibraryCodeForTypes was not specified in the config, allow the settings
-        // or command line to override it.
-        if (configOptions.useLibraryCodeForTypes === undefined) {
-            configOptions.useLibraryCodeForTypes = commandLineOptions.useLibraryCodeForTypes;
-        }
-        else if (commandLineOptions.useLibraryCodeForTypes !== undefined) {
-            reportDuplicateSetting('useLibraryCodeForTypes', configOptions.useLibraryCodeForTypes);
-        }
         // If useLibraryCodeForTypes is unspecified, default it to true.
         if (configOptions.useLibraryCodeForTypes === undefined) {
             configOptions.useLibraryCodeForTypes = true;
         }
-        if (commandLineOptions.stubPath) {
-            if (!configOptions.stubPath) {
-                configOptions.stubPath = this.fs.realCasePath(projectRoot.resolvePaths(commandLineOptions.stubPath));
-            }
-            else {
-                reportDuplicateSetting('stubPath', configOptions.stubPath.toUserVisibleString());
-            }
-        }
         if (configOptions.stubPath) {
             // If there was a stub path specified, validate it.
             if (!this.fs.existsSync(configOptions.stubPath) || !(0, uriUtils_1.isDirectory)(this.fs, configOptions.stubPath)) {
@@ -574,7 +519,7 @@ class AnalyzerService {
             // venvPath without venv means it won't do anything while resolveImport.
             // so first, try to set venv from existing configOption if it is null. if both are null,
             // then, resolveImport won't consider venv
-            configOptions.venv = (_d = configOptions.venv) !== null && _d !== void 0 ? _d : this._configOptions.venv;
+            configOptions.venv = (_b = configOptions.venv) !== null && _b !== void 0 ? _b : this._configOptions.venv;
             if (configOptions.venv && configOptions.venvPath) {
                 const fullVenvPath = configOptions.venvPath.resolvePaths(configOptions.venv);
                 if (!this.fs.existsSync(fullVenvPath) || !(0, uriUtils_1.isDirectory)(this.fs, fullVenvPath)) {
@@ -605,7 +550,132 @@ class AnalyzerService {
                 this._console.error(`typeshedPath ${configOptions.typeshedPath.toUserVisibleString()} is not a valid directory.`);
             }
         }
-        return configOptions;
+        // This is a special case. It can be set in the config file, but if it's set on the command line, we should always
+        // override it.
+        if (commandLineOptions.configSettings.verboseOutput !== undefined) {
+            configOptions.verboseOutput = commandLineOptions.configSettings.verboseOutput;
+        }
+    }
+    _applyLanguageServerOptions(configOptions, languageServerOptions) {
+        configOptions.disableTaggedHints = !!languageServerOptions.disableTaggedHints;
+        if (languageServerOptions.checkOnlyOpenFiles !== undefined) {
+            configOptions.checkOnlyOpenFiles = languageServerOptions.checkOnlyOpenFiles;
+        }
+        if (languageServerOptions.autoImportCompletions !== undefined) {
+            configOptions.autoImportCompletions = languageServerOptions.autoImportCompletions;
+        }
+        if (languageServerOptions.indexing !== undefined) {
+            configOptions.indexing = languageServerOptions.indexing;
+        }
+        if (languageServerOptions.taskListTokens) {
+            configOptions.taskListTokens = languageServerOptions.taskListTokens;
+        }
+        if (languageServerOptions.logTypeEvaluationTime !== undefined) {
+            configOptions.logTypeEvaluationTime = languageServerOptions.logTypeEvaluationTime;
+        }
+        configOptions.typeEvaluationTimeThreshold = languageServerOptions.typeEvaluationTimeThreshold;
+        // Special case, the language service can also set a pythonPath. It should override any other setting.
+        if (languageServerOptions.pythonPath) {
+            this._console.info(`Setting pythonPath for service "${this._instanceName}": ` + `"${languageServerOptions.pythonPath}"`);
+            configOptions.pythonPath = this.fs.realCasePath(uri_1.Uri.file(languageServerOptions.pythonPath, this.serviceProvider, /* checkRelative */ true));
+        }
+    }
+    _applyCommandLineOverrides(configOptions, commandLineOptions, projectRoot, fromLanguageServer) {
+        var _a, _b, _c;
+        if (commandLineOptions.typeCheckingMode) {
+            configOptions.initializeTypeCheckingMode(commandLineOptions.typeCheckingMode);
+        }
+        if (commandLineOptions.extraPaths) {
+            const oldExtraPaths = configOptions.defaultExtraPaths ? [...configOptions.defaultExtraPaths] : [];
+            configOptions.ensureDefaultExtraPaths(this.fs, (_a = commandLineOptions.autoSearchPaths) !== null && _a !== void 0 ? _a : false, commandLineOptions.extraPaths);
+            // Execution environments inherit the default extra paths, so we need to update them as well.
+            configOptions.executionEnvironments.forEach((env) => {
+                env.extraPaths = env.extraPaths.filter((path) => !oldExtraPaths.some((oldPath) => oldPath.equals(path)));
+                env.extraPaths.push(...configOptions.defaultExtraPaths);
+            });
+        }
+        if (commandLineOptions.pythonVersion || commandLineOptions.pythonPlatform) {
+            configOptions.defaultPythonVersion = (_b = commandLineOptions.pythonVersion) !== null && _b !== void 0 ? _b : configOptions.defaultPythonVersion;
+            configOptions.defaultPythonPlatform =
+                (_c = commandLineOptions.pythonPlatform) !== null && _c !== void 0 ? _c : configOptions.defaultPythonPlatform;
+            // This should also override any of the execution environment settings.
+            configOptions.executionEnvironments.forEach((env) => {
+                var _a, _b;
+                env.pythonVersion = (_a = commandLineOptions.pythonVersion) !== null && _a !== void 0 ? _a : env.pythonVersion;
+                env.pythonPlatform = (_b = commandLineOptions.pythonPlatform) !== null && _b !== void 0 ? _b : env.pythonPlatform;
+            });
+        }
+        if (commandLineOptions.pythonPath) {
+            this._console.info(`Setting pythonPath for service "${this._instanceName}": ` + `"${commandLineOptions.pythonPath}"`);
+            configOptions.pythonPath = this.fs.realCasePath(uri_1.Uri.file(commandLineOptions.pythonPath, this.serviceProvider, /* checkRelative */ true));
+        }
+        if (commandLineOptions.pythonEnvironmentName) {
+            this._console.info(`Setting environmentName for service "${this._instanceName}": ` +
+                `"${commandLineOptions.pythonEnvironmentName}"`);
+            configOptions.pythonEnvironmentName = commandLineOptions.pythonEnvironmentName;
+        }
+        commandLineOptions.includeFileSpecs.forEach((fileSpec) => {
+            configOptions.include.push((0, uriUtils_1.getFileSpec)(projectRoot, fileSpec));
+        });
+        commandLineOptions.excludeFileSpecs.forEach((fileSpec) => {
+            configOptions.exclude.push((0, uriUtils_1.getFileSpec)(projectRoot, fileSpec));
+        });
+        commandLineOptions.ignoreFileSpecs.forEach((fileSpec) => {
+            configOptions.ignore.push((0, uriUtils_1.getFileSpec)(projectRoot, fileSpec));
+        });
+        configOptions.applyDiagnosticOverrides(commandLineOptions.diagnosticSeverityOverrides);
+        // Override the analyzeUnannotatedFunctions setting based on the command-line setting.
+        if (commandLineOptions.analyzeUnannotatedFunctions !== undefined) {
+            configOptions.diagnosticRuleSet.analyzeUnannotatedFunctions =
+                commandLineOptions.analyzeUnannotatedFunctions;
+        }
+        // Override the include based on command-line settings.
+        if (commandLineOptions.includeFileSpecsOverride) {
+            configOptions.include = [];
+            commandLineOptions.includeFileSpecsOverride.forEach((include) => {
+                configOptions.include.push((0, uriUtils_1.getFileSpec)(uri_1.Uri.file(include, this.serviceProvider, /* checkRelative */ true), '.'));
+            });
+        }
+        const reportDuplicateSetting = (settingName, configValue) => {
+            const settingSource = fromLanguageServer ? 'the client settings' : 'a command-line option';
+            this._console.warn(`The ${settingName} has been specified in both the config file and ` +
+                `${settingSource}. The value in the config file (${configValue}) ` +
+                `will take precedence`);
+        };
+        // Apply the command-line options if the corresponding
+        // item wasn't already set in the config file. Report any
+        // duplicates.
+        if (commandLineOptions.venvPath) {
+            if (!configOptions.venvPath) {
+                configOptions.venvPath = projectRoot.resolvePaths(commandLineOptions.venvPath);
+            }
+            else {
+                reportDuplicateSetting('venvPath', configOptions.venvPath.toUserVisibleString());
+            }
+        }
+        if (commandLineOptions.typeshedPath) {
+            if (!configOptions.typeshedPath) {
+                configOptions.typeshedPath = projectRoot.resolvePaths(commandLineOptions.typeshedPath);
+            }
+            else {
+                reportDuplicateSetting('typeshedPath', configOptions.typeshedPath.toUserVisibleString());
+            }
+        }
+        // If useLibraryCodeForTypes was not specified in the config, allow the command line to override it.
+        if (configOptions.useLibraryCodeForTypes === undefined) {
+            configOptions.useLibraryCodeForTypes = commandLineOptions.useLibraryCodeForTypes;
+        }
+        else if (commandLineOptions.useLibraryCodeForTypes !== undefined) {
+            reportDuplicateSetting('useLibraryCodeForTypes', configOptions.useLibraryCodeForTypes);
+        }
+        if (commandLineOptions.stubPath) {
+            if (!configOptions.stubPath) {
+                configOptions.stubPath = this.fs.realCasePath(projectRoot.resolvePaths(commandLineOptions.stubPath));
+            }
+            else {
+                reportDuplicateSetting('stubPath', configOptions.stubPath.toUserVisibleString());
+            }
+        }
     }
     // Loads the config JSON object from the specified config file along with any
     // chained config files specified in the "extends" property (recursively).
@@ -1282,7 +1352,7 @@ class AnalyzerService {
         // cached based on the previous config options.
         const importResolver = this._importResolverFactory(this._serviceProvider, this._backgroundAnalysisProgram.configOptions, host);
         this._backgroundAnalysisProgram.setImportResolver(importResolver);
-        if (((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.fromVsCodeExtension) || this._configOptions.verboseOutput) {
+        if (((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.fromLanguageServer) || this._configOptions.verboseOutput) {
             const logLevel = this._configOptions.verboseOutput ? console_1.LogLevel.Info : console_1.LogLevel.Log;
             for (const execEnv of this._configOptions.getExecutionEnvironments()) {
                 (0, console_1.log)(this._console, logLevel, `Search paths for ${execEnv.root || '<default>'}`);
@@ -1306,7 +1376,7 @@ class AnalyzerService {
     }
     _scheduleReanalysis(requireTrackedFileUpdate) {
         var _a, _b;
-        if (this._disposed || !((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.enableAmbientAnalysis)) {
+        if (this._disposed || !((_a = this._commandLineOptions) === null || _a === void 0 ? void 0 : _a.languageServerSettings.enableAmbientAnalysis)) {
             // already disposed
             return;
         }