Merge 1.1.381

build/azuredevops/azure-pipelines-release.yml

@@ -23,7 +23,7 @@ extends:
       codeql:
         compiled:
           enabled: false
-          justificationForDisabling: 'Running a scan on the Pyright-Build'
+          justificationForDisabling: 'Running a scan on the Pyright-Build azure-pipelines.yml'
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
     pool:
       pool:
@@ -82,6 +82,59 @@ extends:
                   SourceFolder: packages/vscode-pyright
                   Contents: '*.vsix'
                   TargetFolder: build_output
+
+              - script: |
+                  npm install -g @vscode/vsce
+                displayName: 'Install vsce and dependencies'
+
+              - script: npx vsce generate-manifest -i $(VSIX_NAME) -o extension.manifest
+                displayName: 'Generate extension manifest'
+                workingDirectory: packages/vscode-pyright
+
+              - task: NuGetToolInstaller@1
+                displayName: 'Install NuGet'
+
+              - task: NuGetCommand@2
+                inputs:
+                  command: 'restore'
+                  restoreSolution: '$(Build.SourcesDirectory)/packages/vscode-pyright/packages.config'
+                  restoreDirectory: '$(Build.SourcesDirectory)/packages/vscode-pyright/packages'
+
+              - task: MSBuild@1
+                displayName: 'Sign binaries'
+                inputs:
+                  solution: 'packages/vscode-pyright/sign.proj'
+                  msbuildArguments: '/verbosity:diagnostic /p:SignType=real'
+
+              - task: PowerShell@2
+                displayName: 'Compare extension.manifest and extension.signature.p7s'
+                inputs:
+                  targetType: 'inline'
+                  script: |
+                    $manifestPath = "$(Build.SourcesDirectory)\packages\vscode-pyright\extension.manifest"
+                    $signaturePath = "$(Build.SourcesDirectory)\packages\vscode-pyright\extension.signature.p7s"
+                    $compareResult = Compare-Object (Get-Content $manifestPath) (Get-Content $signaturePath)
+                    if ($compareResult -eq $null) {
+                      Write-Error "Files are identical. Failing the build."
+                      exit 1
+                    } else {
+                      Write-Output "Files are different."
+                    }
+
+              - task: CopyFiles@2
+                displayName: 'Copy extension.manifest'
+                inputs:
+                  SourceFolder: 'packages/vscode-pyright'
+                  Contents: 'extension.manifest'
+                  TargetFolder: build_output
+
+              - task: CopyFiles@2
+                displayName: 'Copy extension.signature.p7s'
+                inputs:
+                  SourceFolder: 'packages/vscode-pyright'
+                  Contents: 'extension.signature.p7s'
+                  TargetFolder: build_output
+
       - stage: CreateRelease
         dependsOn:
           - BuildVsix
@@ -129,14 +182,12 @@ extends:
               - task: NodeTool@0
                 inputs:
                   versionSpec: 18.x
-              - task: DownloadGitHubRelease@0
-                displayName: 'Download VSIX'
+              - task: DownloadPipelineArtifact@2
+                displayName: 'Download Artifacts from Validation Job'
                 inputs:
-                  connection: 'Github-Pylance'
-                  userRepository: 'microsoft/pyright'
-                  defaultVersionType: 'specificTag'
-                  version: $(Build.SourceBranchName)
-                  downloadPath: '$(System.ArtifactsDirectory)'
+                  buildType: 'current'
+                  artifactName: '$(ARTIFACT_NAME_VSIX)'
+                  targetPath: '$(System.ArtifactsDirectory)'
               # https://code.visualstudio.com/api/working-with-extensions/publishing-extension
               # Install dependencies and VS Code Extension Manager (vsce >= v2.26.1 needed)
               - script: |
@@ -145,13 +196,13 @@ extends:
               # https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token
               # Publish to Marketplace
               # see. stackoverflow.com/collectives/ci-cd/articles/76873787/publish-azure-devops-extensions-using-azure-workload-identity
+              # az rest -u https://app.vssps.visualstudio.com/_apis/profile/profiles/me --resource 499b84ac-1321-427f-aa17-267ca6975798
               - task: AzureCLI@2
                 displayName: 'Publishing with Managed Identity'
                 inputs:
                   azureSubscription: PyrightPublishPipelineSecureConnectionWithManagedIdentity
                   scriptType: 'pscore'
                   scriptLocation: 'inlineScript'
                   inlineScript: |
-                    az rest -u https://app.vssps.visualstudio.com/_apis/profile/profiles/me --resource 499b84ac-1321-427f-aa17-267ca6975798
                     $aadToken = az account get-access-token --query accessToken --resource 499b84ac-1321-427f-aa17-267ca6975798 -o tsv
-                    vsce publish --pat $aadToken --packagePath $(System.ArtifactsDirectory)/$(VSIX_NAME) --noVerify
+                    vsce publish --pat $aadToken --packagePath $(System.ArtifactsDirectory)/$(VSIX_NAME) --noVerify --manifestPath $(System.ArtifactsDirectory)/extension.manifest --signaturePath $(System.ArtifactsDirectory)/extension.signature.p7s

build/generateUnicodeTables.py

@@ -115,6 +115,7 @@ def getSurrogateRanges(chars: list[Character]) -> list[CharacterRange]:
 def writeRangeTable(writer: TextIOWrapper, category: str, chars: list[Character]):
     chars = [ch for ch in chars if ch.category == category]
 
+    writer.write("\n")
     writer.write(f"export const unicode{category}: UnicodeRangeTable = [\n")
 
     consecutiveRangeStartChar: Character | None = None
@@ -126,13 +127,13 @@ def writeRangeTable(writer: TextIOWrapper, category: str, chars: list[Character]
 
         if i + 1 >= len(chars) or chars[i + 1].code != char.code + 1:
             if consecutiveRangeStartChar.code == char.code:
-                writer.write(f"    0x{consecutiveRangeStartChar.code:04X},\n")
+                writer.write(f"    0x{consecutiveRangeStartChar.code:04x},\n")
             else:
-                writer.write(f"    [0x{consecutiveRangeStartChar.code:04X}, 0x{char.code:04X}],\n")
+                writer.write(f"    [0x{consecutiveRangeStartChar.code:04x}, 0x{char.code:04x}],\n")
 
             consecutiveRangeStartChar = None
 
-    writer.write("];\n\n")
+    writer.write("];\n")
 
 
 # Write out a table of all characters within the specified category using their UTF-16
@@ -146,6 +147,7 @@ def writeSurrogateRangeTable(
     if len(surrogateRanges) == 0:
         return
 
+    writer.write("\n")
     writer.write(
         f"export const unicode{category}Surrogate: UnicodeSurrogateRangeTable = {{\n"
     )
@@ -160,21 +162,21 @@ def writeSurrogateRangeTable(
             previousCharRange = None
 
         if not previousCharRange:
-            writer.write(f"    0x{charRange.start.highSurrogate:04X}: [\n")
+            writer.write(f"    0x{charRange.start.highSurrogate:04x}: [\n")
             previousCharRange = charRange
 
         if charRange.start.lowSurrogate == charRange.end.lowSurrogate:
-            writer.write(f"        0x{charRange.start.lowSurrogate:04X}, // 0x{charRange.start.code:04X}\n")
+            writer.write(f"        0x{charRange.start.lowSurrogate:04x}, // 0x{charRange.start.code:04X}\n")
         else:
             writer.write(
-                f"        [0x{charRange.start.lowSurrogate:04X}, 0x{charRange.end.lowSurrogate:04X}], // 0x{charRange.start.code:04X}..0x{charRange.end.code:04X}\n"
+                f"        [0x{charRange.start.lowSurrogate:04x}, 0x{charRange.end.lowSurrogate:04x}], // 0x{charRange.start.code:04X}..0x{charRange.end.code:04X}\n"
             )
 
     writer.write("    ],\n")
-    writer.write("};\n\n")
+    writer.write("};\n")
 
 
-unicodeVersion = "15.1" if len(sys.argv) <= 1 else sys.argv[1]
+unicodeVersion = "16.0" if len(sys.argv) <= 1 else sys.argv[1]
 path = downloadUnicodeData(unicodeVersion)
 chars = parseFile(path)
 surrogateRanges = getSurrogateRanges(chars)
@@ -196,7 +198,6 @@ def writeSurrogateRangeTable(
 export type UnicodeRange = [number, number] | number;
 export type UnicodeRangeTable = UnicodeRange[];
 export type UnicodeSurrogateRangeTable = {{ [surrogate: number]: UnicodeRange[] }};
-
 """
     )
 

docs/configuration.md

@@ -193,7 +193,7 @@ The following settings allow more fine grained control over the **typeCheckingMo
 
 - <a name="reportCallInDefaultInitializer"></a> **reportCallInDefaultInitializer** [boolean or string, optional]: Generate or suppress diagnostics for function calls, list expressions, set expressions, or dictionary expressions within a default value initialization expression. Such calls can mask expensive operations that are performed at module initialization time.
 
-- <a name="reportUnnecessaryIsInstance"></a> **reportUnnecessaryIsInstance** [boolean or string, optional]: Generate or suppress diagnostics for `isinstance` or `issubclass` calls where the result is statically determined to be always true. Such calls are often indicative of a programming error.
+- <a name="reportUnnecessaryIsInstance"></a> **reportUnnecessaryIsInstance** [boolean or string, optional]: Generate or suppress diagnostics for `isinstance` or `issubclass` calls where the result is statically determined to be always true or always false. Such calls are often indicative of a programming error.
 
 - <a name="reportUnnecessaryCast"></a> **reportUnnecessaryCast** [boolean or string, optional]: Generate or suppress diagnostics for `cast` calls that are statically determined to be unnecessary. Such calls are sometimes indicative of a programming error.
 

lerna.json

@@ -2,7 +2,7 @@
     "packages": [
         "packages/*"
     ],
-    "version": "1.1.380",
+    "version": "1.1.381",
     "command": {
         "version": {
             "push": false,

packages/browser-pyright/package.json

@@ -19,6 +19,7 @@
     },
     "scripts": {
         "build": "webpack --mode production --progress",
+        "build:dev": "webpack --mode development --progress",
         "clean": "shx rm -rf ./dist ./out LICENSE.txt",
         "prepack": "npm run clean && shx cp ../../LICENSE.txt . && npm run build",
         "webpack": "webpack --mode development --progress"

packages/browser-pyright/src/browserWorkersHost.ts

@@ -1,7 +1,7 @@
 import {
     Transferable,
     WorkersHost,
-    MessageSourceSink,
+    Worker,
     MessagePort,
     MessageChannel,
     shallowReplace,
@@ -22,7 +22,7 @@ export class BrowserWorkersHost implements WorkersHost {
         return this._parentPort ? new BrowserMessagePort(this._parentPort) : null;
     }
 
-    createWorker(initialData?: any): MessageSourceSink {
+    createWorker(initialData?: any): Worker {
         const channel = new globalThis.MessageChannel();
         self.postMessage(
             {
@@ -46,7 +46,7 @@ export class BrowserWorkersHost implements WorkersHost {
     }
 }
 
-class BrowserMessagePort implements MessagePort {
+class BrowserMessagePort implements MessagePort, Worker {
     constructor(private _delegate: globalThis.MessagePort) {}
     unwrap() {
         return this._delegate;
@@ -73,6 +73,11 @@ class BrowserMessagePort implements MessagePort {
     close() {
         this._delegate.close();
     }
+    terminate = () => {
+        console.warn('Worker.terminate was called. TODO: figure out what to do');
+        this._delegate.close(); // this?
+        return Promise.resolve(0);
+    };
 }
 
 function unwrapForSend(value: any): any {

packages/browser-pyright/webpack.config.js

@@ -21,6 +21,9 @@ module.exports = async (_, { mode }) => {
         entry: {
             pyright: './src/worker.ts',
         },
+        optimization: {
+            minimize: mode === 'production',
+        },
         output: {
             filename: '[name].worker.js',
             path: outPath,

packages/pyright-internal/package.json

@@ -2,7 +2,7 @@
     "name": "pyright-internal",
     "displayName": "pyright",
     "description": "Type checker for the Python language",
-    "version": "1.1.380",
+    "version": "1.1.381",
     "license": "MIT",
     "private": true,
     "files": [

packages/pyright-internal/src/analyzer/analysis.ts

@@ -29,6 +29,7 @@ export interface AnalysisResults {
     configParseErrors: string[];
     elapsedTime: number;
     error?: Error | undefined;
+    reason: 'analysis' | 'tracking';
 }
 
 export interface RequiringAnalysisCount {
@@ -76,6 +77,7 @@ export function analyzeProgram(
                 fatalErrorOccurred: false,
                 configParseErrors: [],
                 elapsedTime,
+                reason: 'analysis',
             });
         }
     } catch (e: any) {
@@ -95,6 +97,7 @@ export function analyzeProgram(
             configParseErrors: [],
             elapsedTime: 0,
             error: debug.getSerializableError(e),
+            reason: 'analysis',
         });
     }
 

packages/pyright-internal/src/analyzer/backgroundAnalysisProgram.ts

@@ -52,6 +52,7 @@ export class BackgroundAnalysisProgram {
             this._disableChecker,
             serviceId
         );
+        this._backgroundAnalysis?.setProgramView(this._program);
     }
 
     get configOptions() {
@@ -155,7 +156,7 @@ export class BackgroundAnalysisProgram {
 
     startAnalysis(token: CancellationToken): boolean {
         if (this._backgroundAnalysis) {
-            this._backgroundAnalysis.startAnalysis(this, token);
+            this._backgroundAnalysis.startAnalysis(token);
             return false;
         }
 
@@ -233,6 +234,7 @@ export class BackgroundAnalysisProgram {
         this._disposed = true;
         this._program.dispose();
         this._backgroundAnalysis?.shutdown();
+        this._backgroundAnalysis?.dispose();
     }
 
     enterEditMode() {
@@ -272,6 +274,7 @@ export class BackgroundAnalysisProgram {
                 fatalErrorOccurred: false,
                 configParseErrors: [],
                 elapsedTime: 0,
+                reason: 'tracking',
             });
         }
     }

packages/pyright-internal/src/analyzer/cacheManager.ts

@@ -9,7 +9,7 @@
  */
 
 import type { HeapInfo } from 'v8';
-import { AnalysisRequest } from '../backgroundAnalysisBase';
+import { BackgroundRequest } from '../backgroundAnalysisBase';
 import { ConsoleInterface } from '../common/console';
 import { fail } from '../common/debug';
 import { getHeapStatistics, getSystemMemoryInfo } from '../common/memUtils';
@@ -51,7 +51,7 @@ export class CacheManager {
         }
     }
 
-    handleCachedUsageBufferMessage(msg: AnalysisRequest) {
+    handleCachedUsageBufferMessage(msg: BackgroundRequest) {
         if (msg.requestType === 'cacheUsageBuffer') {
             const index = parseInt(msg.data || '0');
             const buffer = msg.sharedUsageBuffer;

packages/pyright-internal/src/analyzer/checker.ts

@@ -3868,20 +3868,35 @@ export class Checker extends ParseTreeWalker {
                 node
             );
 
-            if (isNever(narrowedTypeNegative)) {
+            const narrowedTypePositive = narrowTypeForInstanceOrSubclass(
+                this._evaluator,
+                arg0Type,
+                classTypeList,
+                isInstanceCheck,
+                /* isTypeIsCheck */ false,
+                /* isPositiveTest */ true,
+                node
+            );
+
+            const isAlwaysTrue = isNever(narrowedTypeNegative);
+            const isNeverTrue = isNever(narrowedTypePositive);
+
+            if (isAlwaysTrue || isNeverTrue) {
                 const classType = combineTypes(classTypeList.map((t) => convertToInstance(t)));
+                const messageTemplate = isAlwaysTrue
+                    ? isInstanceCheck
+                        ? LocMessage.unnecessaryIsInstanceAlways()
+                        : LocMessage.unnecessaryIsSubclassAlways()
+                    : isInstanceCheck
+                    ? LocMessage.unnecessaryIsInstanceNever()
+                    : LocMessage.unnecessaryIsSubclassNever();
 
                 this._evaluator.addDiagnostic(
                     DiagnosticRule.reportUnnecessaryIsInstance,
-                    isInstanceCheck
-                        ? LocMessage.unnecessaryIsInstanceAlways().format({
-                              testType: this._evaluator.printType(arg0Type),
-                              classType: this._evaluator.printType(classType),
-                          })
-                        : LocMessage.unnecessaryIsSubclassAlways().format({
-                              testType: this._evaluator.printType(arg0Type),
-                              classType: this._evaluator.printType(classType),
-                          }),
+                    messageTemplate.format({
+                        testType: this._evaluator.printType(arg0Type),
+                        classType: this._evaluator.printType(classType),
+                    }),
                     node
                 );
             }