coc-pyright 1.1.332 → 1.1.333
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/README.md +1 -1
- package/lib/index.js +906 -700
- package/package.json +21 -5
package/lib/index.js
CHANGED
|
@@ -1443,7 +1443,7 @@ var require_lru_cache = __commonJS({
|
|
|
1443
1443
|
// node_modules/semver/classes/range.js
|
|
1444
1444
|
var require_range = __commonJS({
|
|
1445
1445
|
"node_modules/semver/classes/range.js"(exports, module2) {
|
|
1446
|
-
var
|
|
1446
|
+
var Range16 = class _Range {
|
|
1447
1447
|
constructor(range, options) {
|
|
1448
1448
|
options = parseOptions(options);
|
|
1449
1449
|
if (range instanceof _Range) {
|
|
@@ -1564,7 +1564,7 @@ var require_range = __commonJS({
|
|
|
1564
1564
|
return false;
|
|
1565
1565
|
}
|
|
1566
1566
|
};
|
|
1567
|
-
module2.exports =
|
|
1567
|
+
module2.exports = Range16;
|
|
1568
1568
|
var LRU = require_lru_cache();
|
|
1569
1569
|
var cache = new LRU({ max: 1e3 });
|
|
1570
1570
|
var parseOptions = require_parse_options();
|
|
@@ -1867,12 +1867,12 @@ var require_comparator = __commonJS({
|
|
|
1867
1867
|
if (this.value === "") {
|
|
1868
1868
|
return true;
|
|
1869
1869
|
}
|
|
1870
|
-
return new
|
|
1870
|
+
return new Range16(comp.value, options).test(this.value);
|
|
1871
1871
|
} else if (comp.operator === "") {
|
|
1872
1872
|
if (comp.value === "") {
|
|
1873
1873
|
return true;
|
|
1874
1874
|
}
|
|
1875
|
-
return new
|
|
1875
|
+
return new Range16(this.value, options).test(comp.semver);
|
|
1876
1876
|
}
|
|
1877
1877
|
options = parseOptions(options);
|
|
1878
1878
|
if (options.includePrerelease && (this.value === "<0.0.0-0" || comp.value === "<0.0.0-0")) {
|
|
@@ -1905,17 +1905,17 @@ var require_comparator = __commonJS({
|
|
|
1905
1905
|
var cmp = require_cmp();
|
|
1906
1906
|
var debug = require_debug();
|
|
1907
1907
|
var SemVer2 = require_semver();
|
|
1908
|
-
var
|
|
1908
|
+
var Range16 = require_range();
|
|
1909
1909
|
}
|
|
1910
1910
|
});
|
|
1911
1911
|
|
|
1912
1912
|
// node_modules/semver/functions/satisfies.js
|
|
1913
1913
|
var require_satisfies = __commonJS({
|
|
1914
1914
|
"node_modules/semver/functions/satisfies.js"(exports, module2) {
|
|
1915
|
-
var
|
|
1915
|
+
var Range16 = require_range();
|
|
1916
1916
|
var satisfies = (version, range, options) => {
|
|
1917
1917
|
try {
|
|
1918
|
-
range = new
|
|
1918
|
+
range = new Range16(range, options);
|
|
1919
1919
|
} catch (er) {
|
|
1920
1920
|
return false;
|
|
1921
1921
|
}
|
|
@@ -1928,8 +1928,8 @@ var require_satisfies = __commonJS({
|
|
|
1928
1928
|
// node_modules/semver/ranges/to-comparators.js
|
|
1929
1929
|
var require_to_comparators = __commonJS({
|
|
1930
1930
|
"node_modules/semver/ranges/to-comparators.js"(exports, module2) {
|
|
1931
|
-
var
|
|
1932
|
-
var toComparators = (range, options) => new
|
|
1931
|
+
var Range16 = require_range();
|
|
1932
|
+
var toComparators = (range, options) => new Range16(range, options).set.map((comp) => comp.map((c) => c.value).join(" ").trim().split(" "));
|
|
1933
1933
|
module2.exports = toComparators;
|
|
1934
1934
|
}
|
|
1935
1935
|
});
|
|
@@ -1938,13 +1938,13 @@ var require_to_comparators = __commonJS({
|
|
|
1938
1938
|
var require_max_satisfying = __commonJS({
|
|
1939
1939
|
"node_modules/semver/ranges/max-satisfying.js"(exports, module2) {
|
|
1940
1940
|
var SemVer2 = require_semver();
|
|
1941
|
-
var
|
|
1941
|
+
var Range16 = require_range();
|
|
1942
1942
|
var maxSatisfying = (versions, range, options) => {
|
|
1943
1943
|
let max = null;
|
|
1944
1944
|
let maxSV = null;
|
|
1945
1945
|
let rangeObj = null;
|
|
1946
1946
|
try {
|
|
1947
|
-
rangeObj = new
|
|
1947
|
+
rangeObj = new Range16(range, options);
|
|
1948
1948
|
} catch (er) {
|
|
1949
1949
|
return null;
|
|
1950
1950
|
}
|
|
@@ -1966,13 +1966,13 @@ var require_max_satisfying = __commonJS({
|
|
|
1966
1966
|
var require_min_satisfying = __commonJS({
|
|
1967
1967
|
"node_modules/semver/ranges/min-satisfying.js"(exports, module2) {
|
|
1968
1968
|
var SemVer2 = require_semver();
|
|
1969
|
-
var
|
|
1969
|
+
var Range16 = require_range();
|
|
1970
1970
|
var minSatisfying = (versions, range, options) => {
|
|
1971
1971
|
let min = null;
|
|
1972
1972
|
let minSV = null;
|
|
1973
1973
|
let rangeObj = null;
|
|
1974
1974
|
try {
|
|
1975
|
-
rangeObj = new
|
|
1975
|
+
rangeObj = new Range16(range, options);
|
|
1976
1976
|
} catch (er) {
|
|
1977
1977
|
return null;
|
|
1978
1978
|
}
|
|
@@ -1994,10 +1994,10 @@ var require_min_satisfying = __commonJS({
|
|
|
1994
1994
|
var require_min_version = __commonJS({
|
|
1995
1995
|
"node_modules/semver/ranges/min-version.js"(exports, module2) {
|
|
1996
1996
|
var SemVer2 = require_semver();
|
|
1997
|
-
var
|
|
1997
|
+
var Range16 = require_range();
|
|
1998
1998
|
var gt = require_gt();
|
|
1999
1999
|
var minVersion = (range, loose) => {
|
|
2000
|
-
range = new
|
|
2000
|
+
range = new Range16(range, loose);
|
|
2001
2001
|
let minver = new SemVer2("0.0.0");
|
|
2002
2002
|
if (range.test(minver)) {
|
|
2003
2003
|
return minver;
|
|
@@ -2049,10 +2049,10 @@ var require_min_version = __commonJS({
|
|
|
2049
2049
|
// node_modules/semver/ranges/valid.js
|
|
2050
2050
|
var require_valid2 = __commonJS({
|
|
2051
2051
|
"node_modules/semver/ranges/valid.js"(exports, module2) {
|
|
2052
|
-
var
|
|
2052
|
+
var Range16 = require_range();
|
|
2053
2053
|
var validRange = (range, options) => {
|
|
2054
2054
|
try {
|
|
2055
|
-
return new
|
|
2055
|
+
return new Range16(range, options).range || "*";
|
|
2056
2056
|
} catch (er) {
|
|
2057
2057
|
return null;
|
|
2058
2058
|
}
|
|
@@ -2067,7 +2067,7 @@ var require_outside = __commonJS({
|
|
|
2067
2067
|
var SemVer2 = require_semver();
|
|
2068
2068
|
var Comparator = require_comparator();
|
|
2069
2069
|
var { ANY } = Comparator;
|
|
2070
|
-
var
|
|
2070
|
+
var Range16 = require_range();
|
|
2071
2071
|
var satisfies = require_satisfies();
|
|
2072
2072
|
var gt = require_gt();
|
|
2073
2073
|
var lt2 = require_lt();
|
|
@@ -2075,7 +2075,7 @@ var require_outside = __commonJS({
|
|
|
2075
2075
|
var gte = require_gte();
|
|
2076
2076
|
var outside = (version, range, hilo, options) => {
|
|
2077
2077
|
version = new SemVer2(version, options);
|
|
2078
|
-
range = new
|
|
2078
|
+
range = new Range16(range, options);
|
|
2079
2079
|
let gtfn, ltefn, ltfn, comp, ecomp;
|
|
2080
2080
|
switch (hilo) {
|
|
2081
2081
|
case ">":
|
|
@@ -2150,10 +2150,10 @@ var require_ltr = __commonJS({
|
|
|
2150
2150
|
// node_modules/semver/ranges/intersects.js
|
|
2151
2151
|
var require_intersects = __commonJS({
|
|
2152
2152
|
"node_modules/semver/ranges/intersects.js"(exports, module2) {
|
|
2153
|
-
var
|
|
2153
|
+
var Range16 = require_range();
|
|
2154
2154
|
var intersects = (r1, r2, options) => {
|
|
2155
|
-
r1 = new
|
|
2156
|
-
r2 = new
|
|
2155
|
+
r1 = new Range16(r1, options);
|
|
2156
|
+
r2 = new Range16(r2, options);
|
|
2157
2157
|
return r1.intersects(r2, options);
|
|
2158
2158
|
};
|
|
2159
2159
|
module2.exports = intersects;
|
|
@@ -2212,7 +2212,7 @@ var require_simplify = __commonJS({
|
|
|
2212
2212
|
// node_modules/semver/ranges/subset.js
|
|
2213
2213
|
var require_subset = __commonJS({
|
|
2214
2214
|
"node_modules/semver/ranges/subset.js"(exports, module2) {
|
|
2215
|
-
var
|
|
2215
|
+
var Range16 = require_range();
|
|
2216
2216
|
var Comparator = require_comparator();
|
|
2217
2217
|
var { ANY } = Comparator;
|
|
2218
2218
|
var satisfies = require_satisfies();
|
|
@@ -2221,8 +2221,8 @@ var require_subset = __commonJS({
|
|
|
2221
2221
|
if (sub === dom) {
|
|
2222
2222
|
return true;
|
|
2223
2223
|
}
|
|
2224
|
-
sub = new
|
|
2225
|
-
dom = new
|
|
2224
|
+
sub = new Range16(sub, options);
|
|
2225
|
+
dom = new Range16(dom, options);
|
|
2226
2226
|
let sawNonNull = false;
|
|
2227
2227
|
OUTER:
|
|
2228
2228
|
for (const simpleSub of sub.set) {
|
|
@@ -2402,7 +2402,7 @@ var require_semver2 = __commonJS({
|
|
|
2402
2402
|
var cmp = require_cmp();
|
|
2403
2403
|
var coerce = require_coerce();
|
|
2404
2404
|
var Comparator = require_comparator();
|
|
2405
|
-
var
|
|
2405
|
+
var Range16 = require_range();
|
|
2406
2406
|
var satisfies = require_satisfies();
|
|
2407
2407
|
var toComparators = require_to_comparators();
|
|
2408
2408
|
var maxSatisfying = require_max_satisfying();
|
|
@@ -2440,7 +2440,7 @@ var require_semver2 = __commonJS({
|
|
|
2440
2440
|
cmp,
|
|
2441
2441
|
coerce,
|
|
2442
2442
|
Comparator,
|
|
2443
|
-
Range:
|
|
2443
|
+
Range: Range16,
|
|
2444
2444
|
satisfies,
|
|
2445
2445
|
toComparators,
|
|
2446
2446
|
maxSatisfying,
|
|
@@ -2784,18 +2784,18 @@ var require_textRange = __commonJS({
|
|
|
2784
2784
|
}
|
|
2785
2785
|
Position11.print = print;
|
|
2786
2786
|
})(Position10 = exports.Position || (exports.Position = {}));
|
|
2787
|
-
var
|
|
2788
|
-
(function(
|
|
2787
|
+
var Range16;
|
|
2788
|
+
(function(Range17) {
|
|
2789
2789
|
function is(value) {
|
|
2790
2790
|
const candidate = value;
|
|
2791
2791
|
return candidate && candidate.start !== void 0 && candidate.end !== void 0;
|
|
2792
2792
|
}
|
|
2793
|
-
|
|
2793
|
+
Range17.is = is;
|
|
2794
2794
|
function print(value) {
|
|
2795
2795
|
return `${Position10.print(value.start)}-${Position10.print(value.end)}`;
|
|
2796
2796
|
}
|
|
2797
|
-
|
|
2798
|
-
})(
|
|
2797
|
+
Range17.print = print;
|
|
2798
|
+
})(Range16 = exports.Range || (exports.Range = {}));
|
|
2799
2799
|
function comparePositions(a, b) {
|
|
2800
2800
|
if (a.line < b.line) {
|
|
2801
2801
|
return -1;
|
|
@@ -4741,22 +4741,22 @@ var require_cancellation = __commonJS({
|
|
|
4741
4741
|
var ral_1 = require_ral();
|
|
4742
4742
|
var Is2 = require_is();
|
|
4743
4743
|
var events_1 = require_events();
|
|
4744
|
-
var
|
|
4745
|
-
(function(
|
|
4746
|
-
|
|
4744
|
+
var CancellationToken23;
|
|
4745
|
+
(function(CancellationToken24) {
|
|
4746
|
+
CancellationToken24.None = Object.freeze({
|
|
4747
4747
|
isCancellationRequested: false,
|
|
4748
4748
|
onCancellationRequested: events_1.Event.None
|
|
4749
4749
|
});
|
|
4750
|
-
|
|
4750
|
+
CancellationToken24.Cancelled = Object.freeze({
|
|
4751
4751
|
isCancellationRequested: true,
|
|
4752
4752
|
onCancellationRequested: events_1.Event.None
|
|
4753
4753
|
});
|
|
4754
4754
|
function is(value) {
|
|
4755
4755
|
const candidate = value;
|
|
4756
|
-
return candidate && (candidate ===
|
|
4756
|
+
return candidate && (candidate === CancellationToken24.None || candidate === CancellationToken24.Cancelled || Is2.boolean(candidate.isCancellationRequested) && !!candidate.onCancellationRequested);
|
|
4757
4757
|
}
|
|
4758
|
-
|
|
4759
|
-
})(
|
|
4758
|
+
CancellationToken24.is = is;
|
|
4759
|
+
})(CancellationToken23 = exports.CancellationToken || (exports.CancellationToken = {}));
|
|
4760
4760
|
var shortcutEvent = Object.freeze(function(callback, context) {
|
|
4761
4761
|
const handle = (0, ral_1.default)().timer.setTimeout(callback.bind(context), 0);
|
|
4762
4762
|
return { dispose() {
|
|
@@ -4804,14 +4804,14 @@ var require_cancellation = __commonJS({
|
|
|
4804
4804
|
}
|
|
4805
4805
|
cancel() {
|
|
4806
4806
|
if (!this._token) {
|
|
4807
|
-
this._token =
|
|
4807
|
+
this._token = CancellationToken23.Cancelled;
|
|
4808
4808
|
} else {
|
|
4809
4809
|
this._token.cancel();
|
|
4810
4810
|
}
|
|
4811
4811
|
}
|
|
4812
4812
|
dispose() {
|
|
4813
4813
|
if (!this._token) {
|
|
4814
|
-
this._token =
|
|
4814
|
+
this._token = CancellationToken23.None;
|
|
4815
4815
|
} else if (this._token instanceof MutableToken) {
|
|
4816
4816
|
this._token.dispose();
|
|
4817
4817
|
}
|
|
@@ -7343,7 +7343,7 @@ var init_main = __esm({
|
|
|
7343
7343
|
}
|
|
7344
7344
|
Position10.is = is;
|
|
7345
7345
|
})(Position || (Position = {}));
|
|
7346
|
-
(function(
|
|
7346
|
+
(function(Range16) {
|
|
7347
7347
|
function create(one, two, three, four) {
|
|
7348
7348
|
if (Is.uinteger(one) && Is.uinteger(two) && Is.uinteger(three) && Is.uinteger(four)) {
|
|
7349
7349
|
return { start: Position.create(one, two), end: Position.create(three, four) };
|
|
@@ -7353,12 +7353,12 @@ var init_main = __esm({
|
|
|
7353
7353
|
throw new Error("Range#create called with invalid arguments[".concat(one, ", ").concat(two, ", ").concat(three, ", ").concat(four, "]"));
|
|
7354
7354
|
}
|
|
7355
7355
|
}
|
|
7356
|
-
|
|
7356
|
+
Range16.create = create;
|
|
7357
7357
|
function is(value) {
|
|
7358
7358
|
var candidate = value;
|
|
7359
7359
|
return Is.objectLiteral(candidate) && Position.is(candidate.start) && Position.is(candidate.end);
|
|
7360
7360
|
}
|
|
7361
|
-
|
|
7361
|
+
Range16.is = is;
|
|
7362
7362
|
})(Range || (Range = {}));
|
|
7363
7363
|
(function(Location2) {
|
|
7364
7364
|
function create(uri, range) {
|
|
@@ -7534,24 +7534,24 @@ var init_main = __esm({
|
|
|
7534
7534
|
}
|
|
7535
7535
|
Command2.is = is;
|
|
7536
7536
|
})(Command || (Command = {}));
|
|
7537
|
-
(function(
|
|
7537
|
+
(function(TextEdit11) {
|
|
7538
7538
|
function replace(range, newText) {
|
|
7539
7539
|
return { range, newText };
|
|
7540
7540
|
}
|
|
7541
|
-
|
|
7541
|
+
TextEdit11.replace = replace;
|
|
7542
7542
|
function insert(position, newText) {
|
|
7543
7543
|
return { range: { start: position, end: position }, newText };
|
|
7544
7544
|
}
|
|
7545
|
-
|
|
7545
|
+
TextEdit11.insert = insert;
|
|
7546
7546
|
function del(range) {
|
|
7547
7547
|
return { range, newText: "" };
|
|
7548
7548
|
}
|
|
7549
|
-
|
|
7549
|
+
TextEdit11.del = del;
|
|
7550
7550
|
function is(value) {
|
|
7551
7551
|
var candidate = value;
|
|
7552
7552
|
return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range.is(candidate.range);
|
|
7553
7553
|
}
|
|
7554
|
-
|
|
7554
|
+
TextEdit11.is = is;
|
|
7555
7555
|
})(TextEdit || (TextEdit = {}));
|
|
7556
7556
|
(function(ChangeAnnotation2) {
|
|
7557
7557
|
function create(label, needsConfirmation, description) {
|
|
@@ -8297,16 +8297,16 @@ var init_main = __esm({
|
|
|
8297
8297
|
}
|
|
8298
8298
|
CodeLens3.is = is;
|
|
8299
8299
|
})(CodeLens || (CodeLens = {}));
|
|
8300
|
-
(function(
|
|
8300
|
+
(function(FormattingOptions8) {
|
|
8301
8301
|
function create(tabSize, insertSpaces) {
|
|
8302
8302
|
return { tabSize, insertSpaces };
|
|
8303
8303
|
}
|
|
8304
|
-
|
|
8304
|
+
FormattingOptions8.create = create;
|
|
8305
8305
|
function is(value) {
|
|
8306
8306
|
var candidate = value;
|
|
8307
8307
|
return Is.defined(candidate) && Is.uinteger(candidate.tabSize) && Is.boolean(candidate.insertSpaces);
|
|
8308
8308
|
}
|
|
8309
|
-
|
|
8309
|
+
FormattingOptions8.is = is;
|
|
8310
8310
|
})(FormattingOptions || (FormattingOptions = {}));
|
|
8311
8311
|
(function(DocumentLink2) {
|
|
8312
8312
|
function create(range, target, data) {
|
|
@@ -8460,16 +8460,16 @@ var init_main = __esm({
|
|
|
8460
8460
|
WorkspaceFolder2.is = is;
|
|
8461
8461
|
})(WorkspaceFolder || (WorkspaceFolder = {}));
|
|
8462
8462
|
EOL = ["\n", "\r\n", "\r"];
|
|
8463
|
-
(function(
|
|
8463
|
+
(function(TextDocument28) {
|
|
8464
8464
|
function create(uri, languageId, version, content) {
|
|
8465
8465
|
return new FullTextDocument(uri, languageId, version, content);
|
|
8466
8466
|
}
|
|
8467
|
-
|
|
8467
|
+
TextDocument28.create = create;
|
|
8468
8468
|
function is(value) {
|
|
8469
8469
|
var candidate = value;
|
|
8470
8470
|
return Is.defined(candidate) && Is.string(candidate.uri) && (Is.undefined(candidate.languageId) || Is.string(candidate.languageId)) && Is.uinteger(candidate.lineCount) && Is.func(candidate.getText) && Is.func(candidate.positionAt) && Is.func(candidate.offsetAt) ? true : false;
|
|
8471
8471
|
}
|
|
8472
|
-
|
|
8472
|
+
TextDocument28.is = is;
|
|
8473
8473
|
function applyEdits(document, edits) {
|
|
8474
8474
|
var text = document.getText();
|
|
8475
8475
|
var sortedEdits = mergeSort2(edits, function(a, b) {
|
|
@@ -8493,7 +8493,7 @@ var init_main = __esm({
|
|
|
8493
8493
|
}
|
|
8494
8494
|
return text;
|
|
8495
8495
|
}
|
|
8496
|
-
|
|
8496
|
+
TextDocument28.applyEdits = applyEdits;
|
|
8497
8497
|
function mergeSort2(data, compare) {
|
|
8498
8498
|
if (data.length <= 1) {
|
|
8499
8499
|
return data;
|
|
@@ -13337,11 +13337,11 @@ var init_main2 = __esm({
|
|
|
13337
13337
|
};
|
|
13338
13338
|
return FullTextDocument3;
|
|
13339
13339
|
}();
|
|
13340
|
-
(function(
|
|
13340
|
+
(function(TextDocument28) {
|
|
13341
13341
|
function create(uri, languageId, version, content) {
|
|
13342
13342
|
return new FullTextDocument2(uri, languageId, version, content);
|
|
13343
13343
|
}
|
|
13344
|
-
|
|
13344
|
+
TextDocument28.create = create;
|
|
13345
13345
|
function update(document, changes, version) {
|
|
13346
13346
|
if (document instanceof FullTextDocument2) {
|
|
13347
13347
|
document.update(changes, version);
|
|
@@ -13350,7 +13350,7 @@ var init_main2 = __esm({
|
|
|
13350
13350
|
throw new Error("TextDocument.update: document must be created by TextDocument.create");
|
|
13351
13351
|
}
|
|
13352
13352
|
}
|
|
13353
|
-
|
|
13353
|
+
TextDocument28.update = update;
|
|
13354
13354
|
function applyEdits(document, edits) {
|
|
13355
13355
|
var text = document.getText();
|
|
13356
13356
|
var sortedEdits = mergeSort(edits.map(getWellformedEdit), function(a, b) {
|
|
@@ -13378,7 +13378,7 @@ var init_main2 = __esm({
|
|
|
13378
13378
|
spans.push(text.substr(lastModifiedOffset));
|
|
13379
13379
|
return spans.join("");
|
|
13380
13380
|
}
|
|
13381
|
-
|
|
13381
|
+
TextDocument28.applyEdits = applyEdits;
|
|
13382
13382
|
})(TextDocument2 || (TextDocument2 = {}));
|
|
13383
13383
|
}
|
|
13384
13384
|
});
|
|
@@ -19178,6 +19178,15 @@ var require_types = __commonJS({
|
|
|
19178
19178
|
return newClassType;
|
|
19179
19179
|
}
|
|
19180
19180
|
ClassType2.cloneForSpecialization = cloneForSpecialization;
|
|
19181
|
+
function cloneIncludeSubclasses(classType) {
|
|
19182
|
+
if (classType.includeSubclasses) {
|
|
19183
|
+
return classType;
|
|
19184
|
+
}
|
|
19185
|
+
const newClassType = TypeBase.cloneType(classType);
|
|
19186
|
+
newClassType.includeSubclasses = true;
|
|
19187
|
+
return newClassType;
|
|
19188
|
+
}
|
|
19189
|
+
ClassType2.cloneIncludeSubclasses = cloneIncludeSubclasses;
|
|
19181
19190
|
function cloneWithLiteral(classType, value) {
|
|
19182
19191
|
const newClassType = TypeBase.cloneType(classType);
|
|
19183
19192
|
newClassType.literalValue = value;
|
|
@@ -19464,6 +19473,9 @@ var require_types = __commonJS({
|
|
|
19464
19473
|
return true;
|
|
19465
19474
|
}
|
|
19466
19475
|
recursionCount++;
|
|
19476
|
+
if (!classType.isTypedDictPartial !== !type2.isTypedDictPartial) {
|
|
19477
|
+
return false;
|
|
19478
|
+
}
|
|
19467
19479
|
if (classType.details === type2.details) {
|
|
19468
19480
|
return true;
|
|
19469
19481
|
}
|
|
@@ -20538,8 +20550,15 @@ var require_types = __commonJS({
|
|
|
20538
20550
|
return false;
|
|
20539
20551
|
}
|
|
20540
20552
|
if (!options.ignoreTypeFlags) {
|
|
20541
|
-
|
|
20542
|
-
|
|
20553
|
+
let type1Flags = type1.flags;
|
|
20554
|
+
let type2Flags = type2.flags;
|
|
20555
|
+
if (options.typeFlagsToHonor !== void 0) {
|
|
20556
|
+
type1Flags &= options.typeFlagsToHonor;
|
|
20557
|
+
type2Flags &= options.typeFlagsToHonor;
|
|
20558
|
+
} else {
|
|
20559
|
+
type1Flags &= ~4;
|
|
20560
|
+
type2Flags &= ~4;
|
|
20561
|
+
}
|
|
20543
20562
|
if (type1Flags !== type2Flags) {
|
|
20544
20563
|
return false;
|
|
20545
20564
|
}
|
|
@@ -20588,6 +20607,9 @@ var require_types = __commonJS({
|
|
|
20588
20607
|
if (!ClassType.isLiteralValueSame(type1, classType2)) {
|
|
20589
20608
|
return false;
|
|
20590
20609
|
}
|
|
20610
|
+
if (!type1.isTypedDictPartial !== !classType2.isTypedDictPartial) {
|
|
20611
|
+
return false;
|
|
20612
|
+
}
|
|
20591
20613
|
if (!options.ignoreTypedDictNarrowEntries && !ClassType.isTypedDictNarrowedEntriesSame(type1, classType2)) {
|
|
20592
20614
|
return false;
|
|
20593
20615
|
}
|
|
@@ -21893,8 +21915,8 @@ var require_typeUtils = __commonJS({
|
|
|
21893
21915
|
"node_modules/@zzzen/pyright-internal/dist/analyzer/typeUtils.js"(exports) {
|
|
21894
21916
|
"use strict";
|
|
21895
21917
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21896
|
-
exports.
|
|
21897
|
-
exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsAnyOrUnknown = exports.containsAnyRecursive = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.derivesFromStdlibClass = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = void 0;
|
|
21918
|
+
exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isTupleIndexUnambiguous = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isCallableType = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.selfSpecializeClass = exports.getUnknownTypeForParamSpec = exports.getUnknownTypeForTypeVar = exports.specializeWithUnknown = exports.specializeWithDefaultTypeArgs = exports.getTypeVarScopeIds = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSignature = exports.doForEachSubtype = exports.sortTypes = exports.cleanIncompleteUnknown = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
|
|
21919
|
+
exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsAnyOrUnknown = exports.containsAnyRecursive = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.derivesFromStdlibClass = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.replaceTypeVarsWithAny = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = void 0;
|
|
21898
21920
|
var collectionUtils_1 = require_collectionUtils();
|
|
21899
21921
|
var debug_1 = require_debug2();
|
|
21900
21922
|
var symbol_1 = require_symbol();
|
|
@@ -22426,15 +22448,48 @@ var require_typeUtils = __commonJS({
|
|
|
22426
22448
|
type,
|
|
22427
22449
|
type.details.typeParameters.map((param) => {
|
|
22428
22450
|
var _a;
|
|
22429
|
-
return (_a = param.details.defaultType) !== null && _a !== void 0 ? _a :
|
|
22451
|
+
return (_a = param.details.defaultType) !== null && _a !== void 0 ? _a : getUnknownTypeForTypeVar(param);
|
|
22430
22452
|
}),
|
|
22431
22453
|
/* isTypeArgumentExplicit */
|
|
22432
22454
|
false,
|
|
22433
22455
|
/* includeSubclasses */
|
|
22434
|
-
|
|
22456
|
+
type.includeSubclasses
|
|
22435
22457
|
);
|
|
22436
22458
|
}
|
|
22437
22459
|
exports.specializeWithDefaultTypeArgs = specializeWithDefaultTypeArgs;
|
|
22460
|
+
function specializeWithUnknown(type) {
|
|
22461
|
+
if (type.details.typeParameters.length === 0) {
|
|
22462
|
+
return type;
|
|
22463
|
+
}
|
|
22464
|
+
return types_1.ClassType.cloneForSpecialization(
|
|
22465
|
+
type,
|
|
22466
|
+
type.details.typeParameters.map((param) => getUnknownTypeForTypeVar(param)),
|
|
22467
|
+
/* isTypeArgumentExplicit */
|
|
22468
|
+
false,
|
|
22469
|
+
/* includeSubclasses */
|
|
22470
|
+
type.includeSubclasses
|
|
22471
|
+
);
|
|
22472
|
+
}
|
|
22473
|
+
exports.specializeWithUnknown = specializeWithUnknown;
|
|
22474
|
+
function getUnknownTypeForTypeVar(typeVar) {
|
|
22475
|
+
if (typeVar.details.isParamSpec) {
|
|
22476
|
+
return getUnknownTypeForParamSpec();
|
|
22477
|
+
}
|
|
22478
|
+
return types_1.UnknownType.create();
|
|
22479
|
+
}
|
|
22480
|
+
exports.getUnknownTypeForTypeVar = getUnknownTypeForTypeVar;
|
|
22481
|
+
function getUnknownTypeForParamSpec() {
|
|
22482
|
+
const newFunction = types_1.FunctionType.createInstance(
|
|
22483
|
+
"",
|
|
22484
|
+
"",
|
|
22485
|
+
"",
|
|
22486
|
+
65536 | 32768
|
|
22487
|
+
/* SkipArgsKwargsCompatibilityCheck */
|
|
22488
|
+
);
|
|
22489
|
+
types_1.FunctionType.addDefaultParameters(newFunction);
|
|
22490
|
+
return newFunction;
|
|
22491
|
+
}
|
|
22492
|
+
exports.getUnknownTypeForParamSpec = getUnknownTypeForParamSpec;
|
|
22438
22493
|
function selfSpecializeClass(type) {
|
|
22439
22494
|
if (type.details.typeParameters.length === 0 || type.typeArguments) {
|
|
22440
22495
|
return type;
|
|
@@ -23161,15 +23216,7 @@ var require_typeUtils = __commonJS({
|
|
|
23161
23216
|
}
|
|
23162
23217
|
if (destType.details.paramSpec) {
|
|
23163
23218
|
if (!typeVarContext.getPrimarySignature().getTypeVar(destType.details.paramSpec)) {
|
|
23164
|
-
|
|
23165
|
-
"",
|
|
23166
|
-
"",
|
|
23167
|
-
"",
|
|
23168
|
-
32768 | 65536
|
|
23169
|
-
/* ParamSpecValue */
|
|
23170
|
-
);
|
|
23171
|
-
types_1.FunctionType.addDefaultParameters(newFunction);
|
|
23172
|
-
typeVarContext.setTypeVarType(destType.details.paramSpec, newFunction);
|
|
23219
|
+
typeVarContext.setTypeVarType(destType.details.paramSpec, getUnknownTypeForTypeVar(destType.details.paramSpec));
|
|
23173
23220
|
}
|
|
23174
23221
|
}
|
|
23175
23222
|
break;
|
|
@@ -23773,17 +23820,17 @@ var require_typeUtils = __commonJS({
|
|
|
23773
23820
|
return false;
|
|
23774
23821
|
}
|
|
23775
23822
|
exports.requiresTypeArguments = requiresTypeArguments;
|
|
23776
|
-
function requiresSpecialization(type,
|
|
23823
|
+
function requiresSpecialization(type, options, recursionCount = 0) {
|
|
23777
23824
|
var _a;
|
|
23778
23825
|
if (recursionCount > types_1.maxTypeRecursionCount) {
|
|
23779
23826
|
return false;
|
|
23780
23827
|
}
|
|
23781
23828
|
recursionCount++;
|
|
23782
|
-
const canUseCache = !ignorePseudoGeneric && !ignoreSelf;
|
|
23829
|
+
const canUseCache = !(options === null || options === void 0 ? void 0 : options.ignorePseudoGeneric) && !(options === null || options === void 0 ? void 0 : options.ignoreSelf);
|
|
23783
23830
|
if (canUseCache && ((_a = type.cached) === null || _a === void 0 ? void 0 : _a.requiresSpecialization) !== void 0) {
|
|
23784
23831
|
return type.cached.requiresSpecialization;
|
|
23785
23832
|
}
|
|
23786
|
-
const result = _requiresSpecialization(type,
|
|
23833
|
+
const result = _requiresSpecialization(type, options, recursionCount);
|
|
23787
23834
|
if (canUseCache) {
|
|
23788
23835
|
if (type.cached === void 0) {
|
|
23789
23836
|
type.cached = {};
|
|
@@ -23793,15 +23840,18 @@ var require_typeUtils = __commonJS({
|
|
|
23793
23840
|
return result;
|
|
23794
23841
|
}
|
|
23795
23842
|
exports.requiresSpecialization = requiresSpecialization;
|
|
23796
|
-
function _requiresSpecialization(type,
|
|
23843
|
+
function _requiresSpecialization(type, options, recursionCount = 0) {
|
|
23797
23844
|
var _a;
|
|
23798
23845
|
switch (type.category) {
|
|
23799
23846
|
case 7: {
|
|
23800
|
-
if (types_1.ClassType.isPseudoGenericClass(type) && ignorePseudoGeneric) {
|
|
23847
|
+
if (types_1.ClassType.isPseudoGenericClass(type) && (options === null || options === void 0 ? void 0 : options.ignorePseudoGeneric)) {
|
|
23848
|
+
return false;
|
|
23849
|
+
}
|
|
23850
|
+
if (!type.isTypeArgumentExplicit && (options === null || options === void 0 ? void 0 : options.ignoreImplicitTypeArgs)) {
|
|
23801
23851
|
return false;
|
|
23802
23852
|
}
|
|
23803
23853
|
if (type.typeArguments) {
|
|
23804
|
-
return type.typeArguments.some((typeArg) => requiresSpecialization(typeArg,
|
|
23854
|
+
return type.typeArguments.some((typeArg) => requiresSpecialization(typeArg, options, recursionCount));
|
|
23805
23855
|
}
|
|
23806
23856
|
return types_1.ClassType.getTypeParameters(type).length > 0;
|
|
23807
23857
|
}
|
|
@@ -23810,37 +23860,37 @@ var require_typeUtils = __commonJS({
|
|
|
23810
23860
|
return true;
|
|
23811
23861
|
}
|
|
23812
23862
|
for (let i = 0; i < type.details.parameters.length; i++) {
|
|
23813
|
-
if (requiresSpecialization(types_1.FunctionType.getEffectiveParameterType(type, i),
|
|
23863
|
+
if (requiresSpecialization(types_1.FunctionType.getEffectiveParameterType(type, i), options, recursionCount)) {
|
|
23814
23864
|
return true;
|
|
23815
23865
|
}
|
|
23816
23866
|
}
|
|
23817
23867
|
const declaredReturnType = type.specializedTypes && type.specializedTypes.returnType ? type.specializedTypes.returnType : type.details.declaredReturnType;
|
|
23818
23868
|
if (declaredReturnType) {
|
|
23819
|
-
if (requiresSpecialization(declaredReturnType,
|
|
23869
|
+
if (requiresSpecialization(declaredReturnType, options, recursionCount)) {
|
|
23820
23870
|
return true;
|
|
23821
23871
|
}
|
|
23822
23872
|
} else if (type.inferredReturnType) {
|
|
23823
|
-
if (requiresSpecialization(type.inferredReturnType,
|
|
23873
|
+
if (requiresSpecialization(type.inferredReturnType, options, recursionCount)) {
|
|
23824
23874
|
return true;
|
|
23825
23875
|
}
|
|
23826
23876
|
}
|
|
23827
23877
|
return false;
|
|
23828
23878
|
}
|
|
23829
23879
|
case 6: {
|
|
23830
|
-
return type.overloads.some((overload) => requiresSpecialization(overload,
|
|
23880
|
+
return type.overloads.some((overload) => requiresSpecialization(overload, options, recursionCount));
|
|
23831
23881
|
}
|
|
23832
23882
|
case 9: {
|
|
23833
|
-
return type.subtypes.some((subtype) => requiresSpecialization(subtype,
|
|
23883
|
+
return type.subtypes.some((subtype) => requiresSpecialization(subtype, options, recursionCount));
|
|
23834
23884
|
}
|
|
23835
23885
|
case 10: {
|
|
23836
23886
|
if (!type.details.recursiveTypeAliasName) {
|
|
23837
|
-
if (type.details.isSynthesizedSelf && ignoreSelf) {
|
|
23887
|
+
if (type.details.isSynthesizedSelf && (options === null || options === void 0 ? void 0 : options.ignoreSelf)) {
|
|
23838
23888
|
return false;
|
|
23839
23889
|
}
|
|
23840
23890
|
return true;
|
|
23841
23891
|
}
|
|
23842
23892
|
if ((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.typeArguments) {
|
|
23843
|
-
return type.typeAliasInfo.typeArguments.some((typeArg) => requiresSpecialization(typeArg,
|
|
23893
|
+
return type.typeAliasInfo.typeArguments.some((typeArg) => requiresSpecialization(typeArg, options, recursionCount));
|
|
23844
23894
|
}
|
|
23845
23895
|
}
|
|
23846
23896
|
}
|
|
@@ -24027,21 +24077,21 @@ var require_typeUtils = __commonJS({
|
|
|
24027
24077
|
}
|
|
24028
24078
|
function convertTypeToParamSpecValue(type) {
|
|
24029
24079
|
if ((0, types_1.isParamSpec)(type)) {
|
|
24030
|
-
const
|
|
24080
|
+
const newFunction = types_1.FunctionType.createInstance(
|
|
24031
24081
|
"",
|
|
24032
24082
|
"",
|
|
24033
24083
|
"",
|
|
24034
24084
|
65536
|
|
24035
24085
|
/* ParamSpecValue */
|
|
24036
24086
|
);
|
|
24037
|
-
|
|
24038
|
-
|
|
24039
|
-
return
|
|
24087
|
+
newFunction.details.paramSpec = type;
|
|
24088
|
+
newFunction.details.typeVarScopeId = getTypeVarScopeId(type);
|
|
24089
|
+
return newFunction;
|
|
24040
24090
|
}
|
|
24041
24091
|
if ((0, types_1.isFunction)(type)) {
|
|
24042
|
-
const
|
|
24092
|
+
const newFunction = types_1.FunctionType.createInstance("", "", "", type.details.flags | 65536, type.details.docString);
|
|
24043
24093
|
type.details.parameters.forEach((param, index) => {
|
|
24044
|
-
types_1.FunctionType.addParameter(
|
|
24094
|
+
types_1.FunctionType.addParameter(newFunction, {
|
|
24045
24095
|
category: param.category,
|
|
24046
24096
|
name: param.name,
|
|
24047
24097
|
hasDefault: param.hasDefault,
|
|
@@ -24050,19 +24100,11 @@ var require_typeUtils = __commonJS({
|
|
|
24050
24100
|
type: types_1.FunctionType.getEffectiveParameterType(type, index)
|
|
24051
24101
|
});
|
|
24052
24102
|
});
|
|
24053
|
-
|
|
24054
|
-
|
|
24055
|
-
return
|
|
24103
|
+
newFunction.details.typeVarScopeId = type.details.paramSpecTypeVarScopeId;
|
|
24104
|
+
newFunction.details.paramSpec = type.details.paramSpec;
|
|
24105
|
+
return newFunction;
|
|
24056
24106
|
}
|
|
24057
|
-
|
|
24058
|
-
"",
|
|
24059
|
-
"",
|
|
24060
|
-
"",
|
|
24061
|
-
65536 | 32768
|
|
24062
|
-
/* SkipArgsKwargsCompatibilityCheck */
|
|
24063
|
-
);
|
|
24064
|
-
types_1.FunctionType.addDefaultParameters(newFunction);
|
|
24065
|
-
return newFunction;
|
|
24107
|
+
return getUnknownTypeForParamSpec();
|
|
24066
24108
|
}
|
|
24067
24109
|
exports.convertTypeToParamSpecValue = convertTypeToParamSpecValue;
|
|
24068
24110
|
function convertParamSpecValueToType(paramSpecValue, omitParamSpec = false) {
|
|
@@ -24509,15 +24551,7 @@ var require_typeUtils = __commonJS({
|
|
|
24509
24551
|
return types_1.AnyType.create();
|
|
24510
24552
|
}
|
|
24511
24553
|
transformParamSpec(paramSpec) {
|
|
24512
|
-
|
|
24513
|
-
"",
|
|
24514
|
-
"",
|
|
24515
|
-
"",
|
|
24516
|
-
65536 | 32768
|
|
24517
|
-
/* SkipArgsKwargsCompatibilityCheck */
|
|
24518
|
-
);
|
|
24519
|
-
types_1.FunctionType.addDefaultParameters(paramSpecValue);
|
|
24520
|
-
return paramSpecValue;
|
|
24554
|
+
return getUnknownTypeForParamSpec();
|
|
24521
24555
|
}
|
|
24522
24556
|
};
|
|
24523
24557
|
var TypeVarDefaultValidator = class extends TypeVarTransformer {
|
|
@@ -24672,16 +24706,6 @@ var require_typeUtils = __commonJS({
|
|
|
24672
24706
|
}
|
|
24673
24707
|
return types_1.UnknownType.create();
|
|
24674
24708
|
}
|
|
24675
|
-
if (this._isSolvingDefaultType && !typeVar.scopeId) {
|
|
24676
|
-
const replacementEntry = signatureContext.getTypeVars().find((entry) => entry.typeVar.details.name === typeVar.details.name);
|
|
24677
|
-
if (replacementEntry) {
|
|
24678
|
-
return signatureContext.getTypeVarType(replacementEntry.typeVar);
|
|
24679
|
-
}
|
|
24680
|
-
if (typeVar.details.defaultType) {
|
|
24681
|
-
return this.apply(typeVar.details.defaultType, recursionCount);
|
|
24682
|
-
}
|
|
24683
|
-
return types_1.UnknownType.create();
|
|
24684
|
-
}
|
|
24685
24709
|
return void 0;
|
|
24686
24710
|
}
|
|
24687
24711
|
transformUnionSubtype(preTransform, postTransform) {
|
|
@@ -24725,7 +24749,7 @@ var require_typeUtils = __commonJS({
|
|
|
24725
24749
|
if (paramSpec.details.defaultType) {
|
|
24726
24750
|
return convertTypeToParamSpecValue(this.apply(paramSpec.details.defaultType, recursionCount));
|
|
24727
24751
|
}
|
|
24728
|
-
return
|
|
24752
|
+
return getUnknownTypeForParamSpec();
|
|
24729
24753
|
}
|
|
24730
24754
|
if (!paramSpec.scopeId || !this._typeVarContext.hasSolveForScope(paramSpec.scopeId)) {
|
|
24731
24755
|
return void 0;
|
|
@@ -24747,7 +24771,7 @@ var require_typeUtils = __commonJS({
|
|
|
24747
24771
|
if (paramSpec.details.defaultType) {
|
|
24748
24772
|
return convertTypeToParamSpecValue(this._solveDefaultType(paramSpec.details.defaultType, recursionCount));
|
|
24749
24773
|
}
|
|
24750
|
-
return
|
|
24774
|
+
return getUnknownTypeForParamSpec();
|
|
24751
24775
|
}
|
|
24752
24776
|
return void 0;
|
|
24753
24777
|
}
|
|
@@ -24783,17 +24807,6 @@ var require_typeUtils = __commonJS({
|
|
|
24783
24807
|
this._isSolvingDefaultType = wasSolvingDefaultType;
|
|
24784
24808
|
return result;
|
|
24785
24809
|
}
|
|
24786
|
-
_getUnknownParamSpec() {
|
|
24787
|
-
const paramSpecValue = types_1.FunctionType.createInstance(
|
|
24788
|
-
"",
|
|
24789
|
-
"",
|
|
24790
|
-
"",
|
|
24791
|
-
65536 | 32768
|
|
24792
|
-
/* SkipArgsKwargsCompatibilityCheck */
|
|
24793
|
-
);
|
|
24794
|
-
types_1.FunctionType.addDefaultParameters(paramSpecValue);
|
|
24795
|
-
return paramSpecValue;
|
|
24796
|
-
}
|
|
24797
24810
|
};
|
|
24798
24811
|
var ExpectedTypeTransformer = class extends TypeVarTransformer {
|
|
24799
24812
|
constructor(_liveTypeVarScopes, _usageOffset) {
|
|
@@ -25899,8 +25912,14 @@ var require_package_nls_cs = __commonJS({
|
|
|
25899
25912
|
delTargetExpr: "V\xFDraz se ned\xE1 odstranit",
|
|
25900
25913
|
deprecatedClass: "T\u0159\xEDda {name} je zastaral\xE1",
|
|
25901
25914
|
deprecatedConstructor: "Konstruktor pro t\u0159\xEDdu {name} je zastaral\xFD",
|
|
25915
|
+
deprecatedDescriptorDeleter: "Metoda \u201E__delete__\u201C pro popisova\u010D \u201E{name}\u201C je zastaral\xE1",
|
|
25916
|
+
deprecatedDescriptorGetter: "Metoda \u201E__get__\u201C pro popisova\u010D \u201E{name}\u201C je zastaral\xE1",
|
|
25917
|
+
deprecatedDescriptorSetter: "Metoda \u201E__set__\u201C pro popisova\u010D \u201E{name}\u201C je zastaral\xE1",
|
|
25902
25918
|
deprecatedFunction: "Funkce {name} je zastaral\xE1.",
|
|
25903
25919
|
deprecatedMethod: "Metoda {name} ve t\u0159\xEDd\u011B {className} je zastaral\xE1.",
|
|
25920
|
+
deprecatedPropertyDeleter: "Odstra\u0148ova\u010D pro vlastnost \u201E{name}\u201C je zastaral\xFD",
|
|
25921
|
+
deprecatedPropertyGetter: "Metoda getter pro vlastnost \u201E{name}\u201C je zastaral\xE1",
|
|
25922
|
+
deprecatedPropertySetter: "Metoda setter pro vlastnost \u201E{name}\u201C je zastaral\xE1",
|
|
25904
25923
|
deprecatedType: "Tento typ je zastaral\xFD jako Python {version}; m\xEDsto toho pou\u017Eijte {replacement}",
|
|
25905
25924
|
dictExpandIllegalInComprehension: "Roz\u0161\xED\u0159en\xED slovn\xEDku nen\xED v porozum\u011Bn\xED povoleno",
|
|
25906
25925
|
dictInAnnotation: "V\xFDraz slovn\xEDku nen\xED v pozn\xE1mce typu povolen\xFD",
|
|
@@ -26129,7 +26148,6 @@ var require_package_nls_cs = __commonJS({
|
|
|
26129
26148
|
paramSpecDefaultNotTuple: "O\u010Dek\xE1valy se t\u0159i te\u010Dky, v\xFDraz \u0159azen\xE9 kolekce \u010Dlen\u016F nebo Parametr ParamSpec pro v\xFDchoz\xED hodnotu ParamSpec",
|
|
26130
26149
|
paramSpecFirstArg: "O\u010Dek\xE1val se n\xE1zev parametru ParamSpec jako prvn\xED argument",
|
|
26131
26150
|
paramSpecKwargsUsage: "\u010Clen kwargs parametru ParamSpec je platn\xFD jenom v p\u0159\xEDpad\u011B, \u017Ee se pou\u017E\xEDv\xE1 s parametrem **kwargs",
|
|
26132
|
-
paramSpecNotBound: "Specifikace parametru {type} nem\xE1 \u017E\xE1dnou v\xE1zanou hodnotu",
|
|
26133
26151
|
paramSpecNotUsedByOuterScope: "Parametr ParamSpec {name} nem\xE1 v tomto kontextu \u017E\xE1dn\xFD v\xFDznam",
|
|
26134
26152
|
paramSpecScopedToReturnType: "Parametr ParamSpec {name} je vymezen\xFD na volatelnou prom\u011Bnnou v r\xE1mci n\xE1vratov\xE9ho typu a ned\xE1 se na n\u011Bj odkazovat v t\u011Ble funkce jazyka",
|
|
26135
26153
|
paramSpecUnknownArg: "Parametr ParamSpec nepodporuje v\xEDce ne\u017E jeden argument",
|
|
@@ -26643,8 +26661,14 @@ var require_package_nls_de = __commonJS({
|
|
|
26643
26661
|
delTargetExpr: "Der Ausdruck kann nicht gel\xF6scht werden",
|
|
26644
26662
|
deprecatedClass: 'Die Klasse "{name}" ist veraltet.',
|
|
26645
26663
|
deprecatedConstructor: 'Der Konstruktor f\xFCr die Klasse "{name}" ist veraltet.',
|
|
26664
|
+
deprecatedDescriptorDeleter: 'Die Methode "__delete__" f\xFCr den Deskriptor "{name}" ist veraltet.',
|
|
26665
|
+
deprecatedDescriptorGetter: 'Die Methode "__get__" f\xFCr den Deskriptor "{name}" ist veraltet.',
|
|
26666
|
+
deprecatedDescriptorSetter: 'Die Methode "__set__" f\xFCr den Deskriptor "{name}" ist veraltet.',
|
|
26646
26667
|
deprecatedFunction: 'Die Funktion "{name}" ist veraltet.',
|
|
26647
26668
|
deprecatedMethod: 'Die Methode "{name}" in der Klasse "{className}" ist veraltet.',
|
|
26669
|
+
deprecatedPropertyDeleter: 'Der Deleter f\xFCr die Eigenschaft "{name}" ist veraltet.',
|
|
26670
|
+
deprecatedPropertyGetter: 'Der Getter f\xFCr die Eigenschaft "{name}" ist veraltet.',
|
|
26671
|
+
deprecatedPropertySetter: 'Der Setter f\xFCr die Eigenschaft "{name}" ist veraltet.',
|
|
26648
26672
|
deprecatedType: 'Dieser Typ ist ab python-{version} veraltet; verwenden Sie stattdessen "{replacement}"',
|
|
26649
26673
|
dictExpandIllegalInComprehension: "W\xF6rterbucherweiterung ist im Verst\xE4ndnis nicht zul\xE4ssig.",
|
|
26650
26674
|
dictInAnnotation: "Ein W\xF6rterbuchausdruck ist in der Typanmerkung nicht zul\xE4ssig.",
|
|
@@ -26873,7 +26897,6 @@ var require_package_nls_de = __commonJS({
|
|
|
26873
26897
|
paramSpecDefaultNotTuple: "Es wurde ein Auslassungszeichen, ein Tupelausdruck oder ParamSpec f\xFCr den Standardwert von ParamSpec erwartet.",
|
|
26874
26898
|
paramSpecFirstArg: "Der Name von ParamSpec wurde als erstes Argument erwartet.",
|
|
26875
26899
|
paramSpecKwargsUsage: 'Das "kwargs"-Element von ParamSpec ist nur g\xFCltig, wenn es mit dem Parameter **kwargs verwendet wird.',
|
|
26876
|
-
paramSpecNotBound: 'Die Parameterspezifikation "{type}" hat keinen gebundenen Wert.',
|
|
26877
26900
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" hat in diesem Kontext keine Bedeutung.',
|
|
26878
26901
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" ist auf einen Aufruf innerhalb des R\xFCckgabetyps beschr\xE4nkt und kann im Funktionstext nicht referenziert werden.',
|
|
26879
26902
|
paramSpecUnknownArg: "ParamSpec unterst\xFCtzt nur ein Argument.",
|
|
@@ -27607,7 +27630,6 @@ var require_package_nls_en_us = __commonJS({
|
|
|
27607
27630
|
paramSpecDefaultNotTuple: "Expected ellipsis, a tuple expression, or ParamSpec for default value of ParamSpec",
|
|
27608
27631
|
paramSpecFirstArg: "Expected name of ParamSpec as first argument",
|
|
27609
27632
|
paramSpecKwargsUsage: '"kwargs" member of ParamSpec is valid only when used with **kwargs parameter',
|
|
27610
|
-
paramSpecNotBound: 'Param spec "{type}" has no bound value',
|
|
27611
27633
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" has no meaning in this context',
|
|
27612
27634
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" is scoped to a callable within the return type and cannot be referenced in the function body',
|
|
27613
27635
|
paramSpecUnknownArg: "ParamSpec does not support more than one argument",
|
|
@@ -27900,6 +27922,7 @@ var require_package_nls_en_us = __commonJS({
|
|
|
27900
27922
|
memberIsWritableInProtocol: '"{name}" is writable in protocol',
|
|
27901
27923
|
memberTypeMismatch: '"{name}" is an incompatible type',
|
|
27902
27924
|
memberUnknown: 'Member "{name}" is unknown',
|
|
27925
|
+
metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
|
|
27903
27926
|
missingProtocolMember: 'Member "{name}" is declared in protocol class "{classType}"',
|
|
27904
27927
|
missingGetter: "Property getter method is missing",
|
|
27905
27928
|
missingSetter: "Property setter method is missing",
|
|
@@ -28137,8 +28160,14 @@ var require_package_nls_es = __commonJS({
|
|
|
28137
28160
|
delTargetExpr: "No se puede eliminar la expresi\xF3n",
|
|
28138
28161
|
deprecatedClass: 'La clase "{name}" est\xE1 en desuso',
|
|
28139
28162
|
deprecatedConstructor: 'El constructor de la clase "{name}" est\xE1 obsoleto',
|
|
28163
|
+
deprecatedDescriptorDeleter: 'El m\xE9todo "__delete__" para el "{name}" de descriptor est\xE1 en desuso',
|
|
28164
|
+
deprecatedDescriptorGetter: 'El m\xE9todo "__get__" para el "{name}" de descriptor est\xE1 en desuso',
|
|
28165
|
+
deprecatedDescriptorSetter: 'El m\xE9todo "__set__" para el "{name}" de descriptor est\xE1 en desuso',
|
|
28140
28166
|
deprecatedFunction: 'La funci\xF3n "{name}" est\xE1 obsoleta',
|
|
28141
28167
|
deprecatedMethod: 'El m\xE9todo "{name}" en la clase "{className}" est\xE1 en desuso',
|
|
28168
|
+
deprecatedPropertyDeleter: 'El eliminador de la propiedad "{name}" est\xE1 en desuso',
|
|
28169
|
+
deprecatedPropertyGetter: 'El captador de la propiedad "{name}" est\xE1 en desuso',
|
|
28170
|
+
deprecatedPropertySetter: 'El establecedor de la propiedad "{name}" est\xE1 en desuso',
|
|
28142
28171
|
deprecatedType: 'Este tipo est\xE1 obsoleto a partir de la {version} de Python; utilice en su lugar "{replacement}".',
|
|
28143
28172
|
dictExpandIllegalInComprehension: "No se permite la ampliaci\xF3n del diccionario en la comprensi\xF3n",
|
|
28144
28173
|
dictInAnnotation: "Expresi\xF3n de diccionario no permitida en anotaci\xF3n de tipo",
|
|
@@ -28367,7 +28396,6 @@ var require_package_nls_es = __commonJS({
|
|
|
28367
28396
|
paramSpecDefaultNotTuple: "Se esperaban puntos suspensivos, una expresi\xF3n de tupla o ParamSpec para el valor predeterminado de ParamSpec",
|
|
28368
28397
|
paramSpecFirstArg: "Se esperaba el nombre de ParamSpec como primer argumento",
|
|
28369
28398
|
paramSpecKwargsUsage: 'El miembro "kwargs" de ParamSpec solo es v\xE1lido cuando se utiliza con el par\xE1metro **kwargs',
|
|
28370
|
-
paramSpecNotBound: 'La especificaci\xF3n de par\xE1metro "{type}" no tiene valor vinculado',
|
|
28371
28399
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" no tiene significado en este contexto',
|
|
28372
28400
|
paramSpecScopedToReturnType: 'El \xE1mbito de ParamSpec "{name}" es un \xE1mbito al que se puede llamar dentro del tipo de valor devuelto y no se puede hacer referencia a \xE9l en el cuerpo de la funci\xF3n.',
|
|
28373
28401
|
paramSpecUnknownArg: "ParamSpec no admite m\xE1s de un argumento",
|
|
@@ -28881,8 +28909,14 @@ var require_package_nls_fr = __commonJS({
|
|
|
28881
28909
|
delTargetExpr: "L'expression ne peut pas \xEAtre supprim\xE9e",
|
|
28882
28910
|
deprecatedClass: 'La classe "{name}" est obsol\xE8te',
|
|
28883
28911
|
deprecatedConstructor: "Le constructeur de la classe \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9",
|
|
28912
|
+
deprecatedDescriptorDeleter: "La m\xE9thode \xAB\xA0__delete__\xA0\xBB du descripteur \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9e",
|
|
28913
|
+
deprecatedDescriptorGetter: "La m\xE9thode \xAB\xA0__get__\xA0\xBB du descripteur \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9e",
|
|
28914
|
+
deprecatedDescriptorSetter: "La m\xE9thode \xAB\xA0__set__\xA0\xBB du descripteur \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9e",
|
|
28884
28915
|
deprecatedFunction: 'La fonction "{name}" est obsol\xE8te',
|
|
28885
28916
|
deprecatedMethod: 'La m\xE9thode "{name}" dans la classe "{className}" est obsol\xE8te',
|
|
28917
|
+
deprecatedPropertyDeleter: "Le deleter de la propri\xE9t\xE9 \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9",
|
|
28918
|
+
deprecatedPropertyGetter: "Le getter de la propri\xE9t\xE9 \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9",
|
|
28919
|
+
deprecatedPropertySetter: "Le setter de la propri\xE9t\xE9 \xAB\xA0{name}\xA0\xBB est d\xE9conseill\xE9",
|
|
28886
28920
|
deprecatedType: "Ce type est d\xE9conseill\xE9 \xE0 compter de Python {version}; utiliser \xAB {replacement} \xBB \xE0 la place",
|
|
28887
28921
|
dictExpandIllegalInComprehension: "Expansion du dictionnaire non autoris\xE9e dans la compr\xE9hension",
|
|
28888
28922
|
dictInAnnotation: "Expression de dictionnaire non autoris\xE9e dans l\u2019annotation de type",
|
|
@@ -29111,7 +29145,6 @@ var require_package_nls_fr = __commonJS({
|
|
|
29111
29145
|
paramSpecDefaultNotTuple: "Points de suspension attendus, expression de tuple ou ParamSpec pour la valeur par d\xE9faut de ParamSpec",
|
|
29112
29146
|
paramSpecFirstArg: "Nom attendu de ParamSpec comme premier argument",
|
|
29113
29147
|
paramSpecKwargsUsage: "Le membre \xAB\xA0configurrgs\xA0\xBB de ParamSpec n\u2019est valide qu\u2019en cas d\u2019utilisation avec le param\xE8tre **rgs",
|
|
29114
|
-
paramSpecNotBound: "La spec de param\xE8tre \xAB\xA0{type}\xA0\xBB n\u2019a pas de valeur li\xE9e",
|
|
29115
29148
|
paramSpecNotUsedByOuterScope: "ParamSpec \xAB\xA0{name}\xA0\xBB n\u2019a aucune signification dans ce contexte",
|
|
29116
29149
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" est limit\xE9 \xE0 un appelable dans le type de retour et ne peut pas \xEAtre r\xE9f\xE9renc\xE9 dans le corps de la fonction',
|
|
29117
29150
|
paramSpecUnknownArg: "ParamSpec ne prend pas en charge plus d'un argument",
|
|
@@ -29625,8 +29658,14 @@ var require_package_nls_it = __commonJS({
|
|
|
29625
29658
|
delTargetExpr: "Non \xE8 possibile eliminare l'espressione",
|
|
29626
29659
|
deprecatedClass: 'La classe "{name}" \xE8 deprecata',
|
|
29627
29660
|
deprecatedConstructor: 'Il costruttore per la classe "{name}" \xE8 deprecato',
|
|
29661
|
+
deprecatedDescriptorDeleter: 'Il metodo "__delete__" per il descrittore "{name}" \xE8 deprecato',
|
|
29662
|
+
deprecatedDescriptorGetter: 'Il metodo "__get__" per il descrittore "{name}" \xE8 deprecato',
|
|
29663
|
+
deprecatedDescriptorSetter: 'Il metodo "__set__" per il descrittore "{name}" \xE8 deprecato',
|
|
29628
29664
|
deprecatedFunction: 'La funzione "{name}" \xE8 deprecata',
|
|
29629
29665
|
deprecatedMethod: 'Il metodo "{name}" nella classe "{className}" \xE8 deprecato',
|
|
29666
|
+
deprecatedPropertyDeleter: 'Il deleter per la propriet\xE0 "{name}" \xE8 deprecato',
|
|
29667
|
+
deprecatedPropertyGetter: 'Il getter per la propriet\xE0 "{name}" \xE8 deprecato',
|
|
29668
|
+
deprecatedPropertySetter: 'Il setter per la propriet\xE0 "{name}" \xE8 deprecato',
|
|
29630
29669
|
deprecatedType: 'Questo tipo \xE8 deprecato a partire da Python {version}; usa "{replacement}"',
|
|
29631
29670
|
dictExpandIllegalInComprehension: "Espansione del dizionario non consentita nella comprensione",
|
|
29632
29671
|
dictInAnnotation: "Espressione dizionario non consentita nell'annotazione di tipo",
|
|
@@ -29855,7 +29894,6 @@ var require_package_nls_it = __commonJS({
|
|
|
29855
29894
|
paramSpecDefaultNotTuple: "Sono previsti puntini di sospensione, un'espressione di tupla o ParamSpec per il valore predefinito di ParamSpec",
|
|
29856
29895
|
paramSpecFirstArg: "Nome previsto di ParamSpec come primo argomento",
|
|
29857
29896
|
paramSpecKwargsUsage: 'Il membro "kwargs" di ParamSpec \xE8 valido solo se usato con il parametro **kwargs',
|
|
29858
|
-
paramSpecNotBound: 'La specifica del parametro "{type}" non ha alcun valore associato',
|
|
29859
29897
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" non ha significato in questo contesto',
|
|
29860
29898
|
paramSpecScopedToReturnType: `L\u2019ambito ParamSpec "{name}" \xE8 un elemento richiamabile all'interno del tipo restituito e non pu\xF2 essere usato come riferimento nel corpo della funzione`,
|
|
29861
29899
|
paramSpecUnknownArg: "ParamSpec non supporta pi\xF9 di un argomento",
|
|
@@ -30369,8 +30407,14 @@ var require_package_nls_ja = __commonJS({
|
|
|
30369
30407
|
delTargetExpr: "\u5F0F\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093",
|
|
30370
30408
|
deprecatedClass: '\u30AF\u30E9\u30B9 "{name}" \u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30371
30409
|
deprecatedConstructor: '\u30AF\u30E9\u30B9 "{name}" \u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30410
|
+
deprecatedDescriptorDeleter: '\u8A18\u8FF0\u5B50 "{name}" \u306E "__delete__" \u30E1\u30BD\u30C3\u30C9\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30411
|
+
deprecatedDescriptorGetter: '\u8A18\u8FF0\u5B50 "{name}" \u306E "__get__" \u30E1\u30BD\u30C3\u30C9\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30412
|
+
deprecatedDescriptorSetter: '\u8A18\u8FF0\u5B50 "{name}" \u306E "__set__" \u30E1\u30BD\u30C3\u30C9\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30372
30413
|
deprecatedFunction: '\u95A2\u6570 "{name}" \u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30373
30414
|
deprecatedMethod: '\u30AF\u30E9\u30B9 "{className}" \u306E\u30E1\u30BD\u30C3\u30C9 "{name}" \u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30415
|
+
deprecatedPropertyDeleter: '\u30D7\u30ED\u30D1\u30C6\u30A3 "{name}" \u306E\u524A\u9664\u5B50\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30416
|
+
deprecatedPropertyGetter: '\u30D7\u30ED\u30D1\u30C6\u30A3 "{name}" \u306E\u30B2\u30C3\u30BF\u30FC\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30417
|
+
deprecatedPropertySetter: '\u30D7\u30ED\u30D1\u30C6\u30A3 "{name}" \u306E\u30BB\u30C3\u30BF\u30FC\u306F\u975E\u63A8\u5968\u3067\u3059',
|
|
30374
30418
|
deprecatedType: '\u3053\u306E\u578B\u306F Python {version} \u3067\u306F\u975E\u63A8\u5968\u3067\u3059\u3002\u4EE3\u308F\u308A\u306B"{replacement}"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044',
|
|
30375
30419
|
dictExpandIllegalInComprehension: "\u8F9E\u66F8\u306E\u5C55\u958B\u306F\u7406\u89E3\u3067\u304D\u307E\u305B\u3093",
|
|
30376
30420
|
dictInAnnotation: "\u8F9E\u66F8\u5F0F\u306F\u578B\u6CE8\u91C8\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093",
|
|
@@ -30599,7 +30643,6 @@ var require_package_nls_ja = __commonJS({
|
|
|
30599
30643
|
paramSpecDefaultNotTuple: "ParamSpec \u306E\u65E2\u5B9A\u5024\u306B\u306F\u3001\u7701\u7565\u8A18\u53F7\u3001\u30BF\u30D7\u30EB\u5F0F\u3001\u307E\u305F\u306F ParamSpec \u304C\u5FC5\u8981\u3067\u3059",
|
|
30600
30644
|
paramSpecFirstArg: "\u6700\u521D\u306E\u5F15\u6570\u3068\u3057\u3066 ParamSpec \u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059",
|
|
30601
30645
|
paramSpecKwargsUsage: 'ParamSpec \u306E "kwargs" \u30E1\u30F3\u30D0\u30FC\u306F\u3001**kwargs \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3068\u5171\u306B\u4F7F\u7528\u3059\u308B\u5834\u5408\u306B\u306E\u307F\u6709\u52B9\u3067\u3059',
|
|
30602
|
-
paramSpecNotBound: '\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC \u4ED5\u69D8 "{type}" \u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u305F\u5024\u304C\u3042\u308A\u307E\u305B\u3093',
|
|
30603
30646
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" \u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u610F\u5473\u304C\u3042\u308A\u307E\u305B\u3093',
|
|
30604
30647
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" \u306F\u3001\u623B\u308A\u5024\u306E\u578B\u5185\u306E\u547C\u3073\u51FA\u3057\u53EF\u80FD\u306A\u30B9\u30B3\u30FC\u30D7\u3067\u3042\u308A\u3001\u95A2\u6570\u672C\u4F53\u3067\u306F\u53C2\u7167\u3067\u304D\u307E\u305B\u3093',
|
|
30605
30648
|
paramSpecUnknownArg: "ParamSpec \u306F\u8907\u6570\u306E\u5F15\u6570\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093",
|
|
@@ -31113,8 +31156,14 @@ var require_package_nls_ko = __commonJS({
|
|
|
31113
31156
|
delTargetExpr: "\uC2DD\uC744 \uC0AD\uC81C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
|
|
31114
31157
|
deprecatedClass: "\u2018{name}\u2019 \uD074\uB798\uC2A4\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
|
|
31115
31158
|
deprecatedConstructor: '\uD074\uB798\uC2A4 "{name}"\uC758 \uC0DD\uC131\uC790\uB294 \uB354 \uC774\uC0C1 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31159
|
+
deprecatedDescriptorDeleter: '"{name}" \uC124\uBA85\uC790\uC5D0 \uB300\uD55C "____delete____" \uBA54\uC11C\uB4DC\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31160
|
+
deprecatedDescriptorGetter: '"{name}" \uC124\uBA85\uC790\uC5D0 \uB300\uD55C "__get__" \uBA54\uC11C\uB4DC\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31161
|
+
deprecatedDescriptorSetter: '"{name}" \uC124\uBA85\uC790\uC5D0 \uB300\uD55C "__set__" \uBA54\uC11C\uB4DC\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31116
31162
|
deprecatedFunction: '"{name}" \uD568\uC218\uB294 \uB354 \uC774\uC0C1 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31117
31163
|
deprecatedMethod: '"{className}" \uD074\uB798\uC2A4\uC758 "{name}" \uBA54\uC11C\uB4DC\uB294 \uB354 \uC774\uC0C1 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31164
|
+
deprecatedPropertyDeleter: '"{name}" \uC18D\uC131\uC5D0 \uB300\uD55C deleter\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31165
|
+
deprecatedPropertyGetter: '"{name}" \uC18D\uC131\uC5D0 \uB300\uD55C getter\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31166
|
+
deprecatedPropertySetter: '"{name}" \uC18D\uC131\uC5D0 \uB300\uD55C setter\uB294 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.',
|
|
31118
31167
|
deprecatedType: '\uC774 \uD615\uC2DD\uC740 Python {version}\uBD80\uD130 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uB300\uC2E0 "{replacement}"\uC744(\uB97C) \uC0AC\uC6A9\uD558\uC138\uC694.',
|
|
31119
31168
|
dictExpandIllegalInComprehension: "\uC0AC\uC804 \uD655\uC7A5\uC740 \uC774\uD574\uC5D0 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
|
|
31120
31169
|
dictInAnnotation: "\uD615\uC2DD \uC8FC\uC11D\uC5D0\uB294 \uC0AC\uC804 \uC2DD\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
|
|
@@ -31343,7 +31392,6 @@ var require_package_nls_ko = __commonJS({
|
|
|
31343
31392
|
paramSpecDefaultNotTuple: "ParamSpec\uC758 \uAE30\uBCF8\uAC12\uC5D0\uB294 \uC904\uC784\uD45C, \uD29C\uD50C \uC2DD \uB610\uB294 ParamSpec\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.",
|
|
31344
31393
|
paramSpecFirstArg: "\uCCAB \uBC88\uC9F8 \uC778\uC218\uB85C ParamSpec\uC758 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.",
|
|
31345
31394
|
paramSpecKwargsUsage: 'ParamSpec\uC758 "kwargs" \uBA64\uBC84\uB294 **kwargs \uB9E4\uAC1C \uBCC0\uC218\uC640 \uD568\uAED8 \uC0AC\uC6A9\uD560 \uB54C\uB9CC \uC720\uD6A8\uD569\uB2C8\uB2E4.',
|
|
31346
|
-
paramSpecNotBound: '\uB9E4\uAC1C \uBCC0\uC218 \uC0AC\uC591 "{type}"\uC5D0 \uBC14\uC778\uB529\uB41C \uAC12\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.',
|
|
31347
31395
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}"\uC740(\uB294) \uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C \uC758\uBBF8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.',
|
|
31348
31396
|
paramSpecScopedToReturnType: "ParamSpec \u2018{name}\u2019\uC740 \uBC18\uD658 \uD615\uC2DD \uB0B4\uC5D0\uC11C \uD638\uCD9C \uAC00\uB2A5\uC73C\uB85C \uBC94\uC704\uAC00 \uC9C0\uC815\uB418\uBA70 \uD568\uC218 \uBCF8\uBB38\uC5D0\uC11C \uCC38\uC870\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
|
|
31349
31397
|
paramSpecUnknownArg: "ParamSpec\uC740 \uD55C \uAC1C \uC774\uC0C1\uC758 \uC778\uC218\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
|
|
@@ -31857,8 +31905,14 @@ var require_package_nls_pl = __commonJS({
|
|
|
31857
31905
|
delTargetExpr: "Nie mo\u017Cna usun\u0105\u0107 wyra\u017Cenia",
|
|
31858
31906
|
deprecatedClass: "Klasa \u201E{name}\u201D jest przestarza\u0142a",
|
|
31859
31907
|
deprecatedConstructor: "Konstruktor klasy \u201E{name}\u201D jest przestarza\u0142y",
|
|
31908
|
+
deprecatedDescriptorDeleter: "Metoda \u201E__set__\u201D dla deskryptora \u201E{name}\u201D jest przestarza\u0142a",
|
|
31909
|
+
deprecatedDescriptorGetter: "Metoda \u201E__set__\u201D dla deskryptora \u201E{name}\u201D jest przestarza\u0142a",
|
|
31910
|
+
deprecatedDescriptorSetter: "Metoda \u201E__set__\u201D dla deskryptora \u201E{name}\u201D jest przestarza\u0142a",
|
|
31860
31911
|
deprecatedFunction: "Ta funkcja \u201E{name}\u201D jest przestarza\u0142a",
|
|
31861
31912
|
deprecatedMethod: "Metoda \u201E{name}\u201D w klasie \u201E{className}\u201D jest przestarza\u0142a",
|
|
31913
|
+
deprecatedPropertyDeleter: "Metoda usuwaj\u0105ca dla w\u0142a\u015Bciwo\u015Bci \u201E{name}\u201D jest przestarza\u0142a",
|
|
31914
|
+
deprecatedPropertyGetter: "Metoda pobieraj\u0105ca dla w\u0142a\u015Bciwo\u015Bci \u201E{name}\u201D jest przestarza\u0142a",
|
|
31915
|
+
deprecatedPropertySetter: "Metoda pobieraj\u0105ca dla w\u0142a\u015Bciwo\u015Bci \u201E{name}\u201D jest przestarza\u0142a",
|
|
31862
31916
|
deprecatedType: "Ten typ jest przestarza\u0142y dla j\u0119zyka Python w wersji {version}; zamiast tego u\u017Cyj \u201E{replacement}\u201D.",
|
|
31863
31917
|
dictExpandIllegalInComprehension: "Rozszerzanie s\u0142ownika jest niedozwolone w rozumieniu",
|
|
31864
31918
|
dictInAnnotation: "Wyra\u017Cenie s\u0142ownikowe jest niedozwolone w adnotacji typu",
|
|
@@ -32087,7 +32141,6 @@ var require_package_nls_pl = __commonJS({
|
|
|
32087
32141
|
paramSpecDefaultNotTuple: "Oczekiwano wielokropka, wyra\u017Cenia krotki lub parametru ParamSpec dla domy\u015Blnej warto\u015Bci ParamSpec",
|
|
32088
32142
|
paramSpecFirstArg: "Oczekiwano nazwy parametru ParamSpec jako pierwszego argumentu",
|
|
32089
32143
|
paramSpecKwargsUsage: "Sk\u0142adowa \u201Ekwargs\u201D parametru ParamSpec jest wa\u017Cna tylko wtedy, gdy jest u\u017Cywana z parametrem **kwargs",
|
|
32090
|
-
paramSpecNotBound: "Specyfikacja parametru \u201E{type}\u201D nie ma warto\u015Bci powi\u0105zanej",
|
|
32091
32144
|
paramSpecNotUsedByOuterScope: "Element ParamSpec \u201E{name}\u201D nie ma znaczenia w tym kontek\u015Bcie",
|
|
32092
32145
|
paramSpecScopedToReturnType: "Parametr ParamSpec \u201E{name}\u201D jest obj\u0119ty zakresem mo\u017Cliwo\u015Bci wywo\u0142ania w ramach zwracanego typu i nie mo\u017Cna odwo\u0142ywa\u0107 si\u0119 do niego w tre\u015Bci funkcji",
|
|
32093
32146
|
paramSpecUnknownArg: "Parametr ParamSpec nie obs\u0142uguje wi\u0119cej ni\u017C jednego argumentu",
|
|
@@ -32601,8 +32654,14 @@ var require_package_nls_pt_br = __commonJS({
|
|
|
32601
32654
|
delTargetExpr: "A express\xE3o n\xE3o pode ser exclu\xEDda",
|
|
32602
32655
|
deprecatedClass: 'A classe "{name}" foi preterida',
|
|
32603
32656
|
deprecatedConstructor: 'O construtor da classe "{name}" foi preterido',
|
|
32657
|
+
deprecatedDescriptorDeleter: 'O m\xE9todo "__delete__" para o descritor "{name}" est\xE1 preterido',
|
|
32658
|
+
deprecatedDescriptorGetter: 'O m\xE9todo "__get__" para o descritor "{name}" est\xE1 preterido',
|
|
32659
|
+
deprecatedDescriptorSetter: 'O m\xE9todo "__set__" para o descritor "{name}" est\xE1 preterido',
|
|
32604
32660
|
deprecatedFunction: 'A fun\xE7\xE3o "{name}" est\xE1 obsoleta',
|
|
32605
32661
|
deprecatedMethod: 'O m\xE9todo "{name}" na classe "{className}" est\xE1 obsoleto',
|
|
32662
|
+
deprecatedPropertyDeleter: 'O exclu\xEDdor da propriedade "{name}" foi preterido',
|
|
32663
|
+
deprecatedPropertyGetter: 'O getter da propriedade "{name}" foi preterido',
|
|
32664
|
+
deprecatedPropertySetter: 'O setter da propriedade "{name}" est\xE1 preterido',
|
|
32606
32665
|
deprecatedType: 'Este tipo foi preterido no Python {version}. Use "{replacement}" em vez disso',
|
|
32607
32666
|
dictExpandIllegalInComprehension: "Expans\xE3o de dicion\xE1rio n\xE3o permitida na compreens\xE3o",
|
|
32608
32667
|
dictInAnnotation: "Express\xE3o de dicion\xE1rio n\xE3o permitida na anota\xE7\xE3o de tipo",
|
|
@@ -32831,7 +32890,6 @@ var require_package_nls_pt_br = __commonJS({
|
|
|
32831
32890
|
paramSpecDefaultNotTuple: "Retic\xEAncias esperadas, uma express\xE3o de tupla ou ParamSpec para o valor padr\xE3o de ParamSpec",
|
|
32832
32891
|
paramSpecFirstArg: "Nome esperado de ParamSpec como primeiro argumento",
|
|
32833
32892
|
paramSpecKwargsUsage: 'O membro "kwargs" de ParamSpec \xE9 v\xE1lido somente quando usado com o par\xE2metro **kwargs',
|
|
32834
|
-
paramSpecNotBound: 'A especifica\xE7\xE3o de par\xE2metro "{type}" n\xE3o tem nenhum valor associado',
|
|
32835
32893
|
paramSpecNotUsedByOuterScope: 'O ParamSpec "{name}" n\xE3o tem significado neste contexto',
|
|
32836
32894
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" tem como escopo um chamador dentro do tipo de retorno e n\xE3o pode ser referenciado no corpo da fun\xE7\xE3o',
|
|
32837
32895
|
paramSpecUnknownArg: "ParamSpec n\xE3o \xE9 compat\xEDvel com mais de um argumento",
|
|
@@ -33345,8 +33403,14 @@ var require_package_nls_qps_ploc = __commonJS({
|
|
|
33345
33403
|
delTargetExpr: "[VLtXk][\u0E19\u0E31\u0E49\xCBxpr\xEBss\xEF\xF8\xF1 \xE7\xE6\xF1\xF1\xF8t \xFE\xEB \xF0\xEBl\xEBt\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
|
|
33346
33404
|
deprecatedClass: '[DIyRn][\u0E19\u0E31\u0E49Th\xEB \xE7l\xE6ss "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33347
33405
|
deprecatedConstructor: '[jq4aQ][\u0E19\u0E31\u0E49Th\xEB \xE7\xF8\xF1str\xB5\xE7t\xF8r f\xF8r \xE7l\xE6ss "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33406
|
+
deprecatedDescriptorDeleter: '[ljYHS][\u0E19\u0E31\u0E49Th\xEB "__\xF0\xEBl\xEBt\xEB__" m\xEBth\xF8\xF0 f\xF8r \xF0\xEBs\xE7r\xEFpt\xF8r "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33407
|
+
deprecatedDescriptorGetter: '[06Y3N][\u0E19\u0E31\u0E49Th\xEB "__g\xEBt__" m\xEBth\xF8\xF0 f\xF8r \xF0\xEBs\xE7r\xEFpt\xF8r "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33408
|
+
deprecatedDescriptorSetter: '[6nQQu][\u0E19\u0E31\u0E49Th\xEB "__s\xEBt__" m\xEBth\xF8\xF0 f\xF8r \xF0\xEBs\xE7r\xEFpt\xF8r "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33348
33409
|
deprecatedFunction: '[GdF0l][\u0E19\u0E31\u0E49Th\xEB f\xB5\xF1\xE7t\xEF\xF8\xF1 "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33349
33410
|
deprecatedMethod: '[GxfND][\u0E19\u0E31\u0E49Th\xEB m\xEBth\xF8\xF0 "{\xF1\xE6m\xEB}" \xEF\xF1 \xE7l\xE6ss "{\xE7l\xE6ss\xD1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33411
|
+
deprecatedPropertyDeleter: '[BUlI2][\u0E19\u0E31\u0E49Th\xEB \xF0\xEBl\xEBt\xEBr f\xF8r pr\xF8p\xEBrt\xFF "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33412
|
+
deprecatedPropertyGetter: '[54BuI][\u0E19\u0E31\u0E49Th\xEB g\xEBtt\xEBr f\xF8r pr\xF8p\xEBrt\xFF "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33413
|
+
deprecatedPropertySetter: '[EHGoz][\u0E19\u0E31\u0E49Th\xEB s\xEBtt\xEBr f\xF8r pr\xF8p\xEBrt\xFF "{\xF1\xE6m\xEB}" \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33350
33414
|
deprecatedType: '[IWdSs][\u0E19\u0E31\u0E49Th\xEFs t\xFFp\xEB \xEFs \xF0\xEBpr\xEB\xE7\xE6t\xEB\xF0 \xE6s \xF8f P\xFFth\xF8\xF1 {v\xEBrs\xEF\xF8\xF1}; \xB5s\xEB "{r\xEBpl\xE6\xE7\xEBm\xEB\xF1t}" \xEF\xF1st\xEB\xE6\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33351
33415
|
dictExpandIllegalInComprehension: "[3B8LL][\u0E19\u0E31\u0E49\xD0\xEF\xE7t\xEF\xF8\xF1\xE6r\xFF \xEBxp\xE6\xF1s\xEF\xF8\xF1 \xF1\xF8t \xE6ll\xF8w\xEB\xF0 \xEF\xF1 \xE7\xF8mpr\xEBh\xEB\xF1s\xEF\xF8\xF1\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
|
|
33352
33416
|
dictInAnnotation: "[0UcII][\u0E19\u0E31\u0E49\xD0\xEF\xE7t\xEF\xF8\xF1\xE6r\xFF \xEBxpr\xEBss\xEF\xF8\xF1 \xF1\xF8t \xE6ll\xF8w\xEB\xF0 \xEF\xF1 t\xFFp\xEB \xE6\xF1\xF1\xF8t\xE6t\xEF\xF8\xF1\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
|
|
@@ -33575,7 +33639,6 @@ var require_package_nls_qps_ploc = __commonJS({
|
|
|
33575
33639
|
paramSpecDefaultNotTuple: "[6Tdff][\u0E19\u0E31\u0E49\xCBxp\xEB\xE7t\xEB\xF0 \xEBll\xEFps\xEFs, \xE6 t\xB5pl\xEB \xEBxpr\xEBss\xEF\xF8\xF1, \xF8r P\xE6r\xE6m\xA7p\xEB\xE7 f\xF8r \xF0\xEBf\xE6\xB5lt v\xE6l\xB5\xEB \xF8f P\xE6r\xE6m\xA7p\xEB\xE7\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
|
|
33576
33640
|
paramSpecFirstArg: "[W2Y3X][\u0E19\u0E31\u0E49\xCBxp\xEB\xE7t\xEB\xF0 \xF1\xE6m\xEB \xF8f P\xE6r\xE6m\xA7p\xEB\xE7 \xE6s f\xEFrst \xE6rg\xB5m\xEB\xF1t\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
|
|
33577
33641
|
paramSpecKwargsUsage: '[2UE71][\u0E19\u0E31\u0E49"kw\xE6rgs" m\xEBm\xFE\xEBr \xF8f P\xE6r\xE6m\xA7p\xEB\xE7 \xEFs v\xE6l\xEF\xF0 \xF8\xF1l\xFF wh\xEB\xF1 \xB5s\xEB\xF0 w\xEFth **kw\xE6rgs p\xE6r\xE6m\xEBt\xEBr\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33578
|
-
paramSpecNotBound: '[xnsuv][\u0E19\u0E31\u0E49P\xE6r\xE6m sp\xEB\xE7 "{t\xFFp\xEB}" h\xE6s \xF1\xF8 \xFE\xF8\xB5\xF1\xF0 v\xE6l\xB5\xEB\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33579
33642
|
paramSpecNotUsedByOuterScope: '[5Pk7H][\u0E19\u0E31\u0E49P\xE6r\xE6m\xA7p\xEB\xE7 "{\xF1\xE6m\xEB}" h\xE6s \xF1\xF8 m\xEB\xE6\xF1\xEF\xF1g \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33580
33643
|
paramSpecScopedToReturnType: '[vVuXS][\u0E19\u0E31\u0E49P\xE6r\xE6m\xA7p\xEB\xE7 "{\xF1\xE6m\xEB}" \xEFs s\xE7\xF8p\xEB\xF0 t\xF8 \xE6 \xE7\xE6ll\xE6\xFEl\xEB w\xEFth\xEF\xF1 th\xEB r\xEBt\xB5r\xF1 t\xFFp\xEB \xE6\xF1\xF0 \xE7\xE6\xF1\xF1\xF8t \xFE\xEB r\xEBf\xEBr\xEB\xF1\xE7\xEB\xF0 \xEF\xF1 th\xEB f\xB5\xF1\xE7t\xEF\xF8\xF1 \xFE\xF8\xF0\xFF\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
|
|
33581
33644
|
paramSpecUnknownArg: "[6zeYc][\u0E19\u0E31\u0E49P\xE6r\xE6m\xA7p\xEB\xE7 \xF0\xF8\xEBs \xF1\xF8t s\xB5pp\xF8rt m\xF8r\xEB th\xE6\xF1 \xF8\xF1\xEB \xE6rg\xB5m\xEB\xF1t\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
|
|
@@ -34089,8 +34152,14 @@ var require_package_nls_ru = __commonJS({
|
|
|
34089
34152
|
delTargetExpr: "\u041D\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435",
|
|
34090
34153
|
deprecatedClass: '\u041A\u043B\u0430\u0441\u0441 "{name}" \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043D\u0435\u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u043C\u044B\u043C',
|
|
34091
34154
|
deprecatedConstructor: '\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440 \u0434\u043B\u044F \u043A\u043B\u0430\u0441\u0441\u0430 "{name}" \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F \u043A \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044E',
|
|
34155
|
+
deprecatedDescriptorDeleter: '\u041C\u0435\u0442\u043E\u0434 "__delete__" \u0434\u043B\u044F \u0434\u0435\u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0440\u0430 "{name}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F',
|
|
34156
|
+
deprecatedDescriptorGetter: '\u041C\u0435\u0442\u043E\u0434 "__get__" \u0434\u043B\u044F \u0434\u0435\u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0440\u0430 "{name}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F',
|
|
34157
|
+
deprecatedDescriptorSetter: '\u041C\u0435\u0442\u043E\u0434 "__set__" \u0434\u043B\u044F \u0434\u0435\u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0440\u0430 "{name}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F',
|
|
34092
34158
|
deprecatedFunction: '\u0424\u0443\u043D\u043A\u0446\u0438\u044F "{name}" \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F \u043A \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044E',
|
|
34093
34159
|
deprecatedMethod: '\u041C\u0435\u0442\u043E\u0434 "{name}" \u0432 \u043A\u043B\u0430\u0441\u0441\u0435 "{className}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F \u043A \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044E',
|
|
34160
|
+
deprecatedPropertyDeleter: '\u041C\u0435\u0442\u043E\u0434 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 "{name}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F',
|
|
34161
|
+
deprecatedPropertyGetter: '\u041C\u0435\u0442\u043E\u0434 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 "{name}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F',
|
|
34162
|
+
deprecatedPropertySetter: '\u041C\u0435\u0442\u043E\u0434 \u0437\u0430\u0434\u0430\u043D\u0438\u044F \u0434\u043B\u044F \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 "{name}" \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F',
|
|
34094
34163
|
deprecatedType: '\u042D\u0442\u043E\u0442 \u0442\u0438\u043F \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F \u043A \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044E \u043D\u0430\u0447\u0438\u043D\u0430\u044F \u0441 \u0432\u0435\u0440\u0441\u0438\u0438 Python {version}; \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0432\u043C\u0435\u0441\u0442\u043E \u043D\u0435\u0433\u043E "{replacement}"',
|
|
34095
34164
|
dictExpandIllegalInComprehension: "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435 \u0441\u043B\u043E\u0432\u0430\u0440\u044F \u0432 \u043F\u043E\u043D\u0438\u043C\u0430\u043D\u0438\u0438 \u043D\u0435 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0435\u0442\u0441\u044F",
|
|
34096
34165
|
dictInAnnotation: "\u0421\u043B\u043E\u0432\u0430\u0440\u043D\u044B\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u043D\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u044B \u0432 \u0437\u0430\u043C\u0435\u0442\u043A\u0430\u0445 \u0442\u0438\u043F\u0430",
|
|
@@ -34319,7 +34388,6 @@ var require_package_nls_ru = __commonJS({
|
|
|
34319
34388
|
paramSpecDefaultNotTuple: "\u0414\u043B\u044F \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F ParamSpec \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u043E\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044F \u043C\u043D\u043E\u0433\u043E\u0442\u043E\u0447\u0438\u0435, \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u043A\u043E\u0440\u0442\u0435\u0436\u0430 \u0438\u043B\u0438 ParamSpec",
|
|
34320
34389
|
paramSpecFirstArg: "\u041E\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044F \u0438\u043C\u044F ParamSpec \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430",
|
|
34321
34390
|
paramSpecKwargsUsage: '\u042D\u043B\u0435\u043C\u0435\u043D\u0442 "kwargs" ParamSpec \u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0438 \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C **kwargs.',
|
|
34322
|
-
paramSpecNotBound: '\u0421\u043F\u0435\u0446\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 "{type}" \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u043D\u043D\u043E\u0433\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F',
|
|
34323
34391
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0441\u043C\u044B\u0441\u043B\u0430 \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435',
|
|
34324
34392
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" \u043E\u0442\u043D\u043E\u0441\u0438\u0442\u0441\u044F \u043A \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0432\u044B\u0437\u044B\u0432\u0430\u0435\u043C\u043E\u0433\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u0430 \u0432 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043C\u043E\u043C \u0442\u0438\u043F\u0435, \u0438 \u043D\u0430 \u043D\u0435\u0433\u043E \u043D\u0435\u043B\u044C\u0437\u044F \u0441\u0441\u044B\u043B\u0430\u0442\u044C\u0441\u044F \u0432 \u0442\u0435\u043A\u0441\u0442\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438.',
|
|
34325
34393
|
paramSpecUnknownArg: "ParamSpec \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0431\u043E\u043B\u0435\u0435 \u043E\u0434\u043D\u043E\u0433\u043E \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430",
|
|
@@ -34833,8 +34901,14 @@ var require_package_nls_tr = __commonJS({
|
|
|
34833
34901
|
delTargetExpr: "\u0130fade silinemiyor",
|
|
34834
34902
|
deprecatedClass: '"{name}" s\u0131n\u0131f\u0131 kullan\u0131m d\u0131\u015F\u0131',
|
|
34835
34903
|
deprecatedConstructor: '"{name}" s\u0131n\u0131f\u0131n\u0131n olu\u015Fturucusu kullan\u0131m d\u0131\u015F\u0131',
|
|
34904
|
+
deprecatedDescriptorDeleter: '"{name}" tan\u0131mlay\u0131c\u0131s\u0131 i\xE7in "__delete__" y\xF6ntemi kullan\u0131m d\u0131\u015F\u0131',
|
|
34905
|
+
deprecatedDescriptorGetter: '"{name}" tan\u0131mlay\u0131c\u0131s\u0131 i\xE7in "__get__" y\xF6ntemi kullan\u0131m d\u0131\u015F\u0131',
|
|
34906
|
+
deprecatedDescriptorSetter: '"{name}" tan\u0131mlay\u0131c\u0131s\u0131 i\xE7in "__set__" y\xF6ntemi kullan\u0131m d\u0131\u015F\u0131',
|
|
34836
34907
|
deprecatedFunction: '"{name}" i\u015Flevi kullan\u0131m d\u0131\u015F\u0131',
|
|
34837
34908
|
deprecatedMethod: '"{className}" s\u0131n\u0131f\u0131ndaki "{name}" y\xF6ntemi kullan\u0131m d\u0131\u015F\u0131',
|
|
34909
|
+
deprecatedPropertyDeleter: '"{name}" \xF6zelli\u011Fi silicisi kullan\u0131m d\u0131\u015F\u0131',
|
|
34910
|
+
deprecatedPropertyGetter: '"{name}" \xF6zelli\u011Fi al\u0131c\u0131s\u0131 kullan\u0131m d\u0131\u015F\u0131',
|
|
34911
|
+
deprecatedPropertySetter: '"{name}" \xF6zelli\u011Fi ayarlay\u0131c\u0131s\u0131 kullan\u0131m d\u0131\u015F\u0131',
|
|
34838
34912
|
deprecatedType: 'Bu t\xFCr Python {version} s\xFCr\xFCm\xFCnden itibaren kullan\u0131m d\u0131\u015F\u0131; bunun yerine "{replacement}" kullan\u0131n',
|
|
34839
34913
|
dictExpandIllegalInComprehension: "S\xF6zl\xFCk geni\u015Fletmeye anlamada izin verilmiyor",
|
|
34840
34914
|
dictInAnnotation: "T\xFCr ek a\xE7\u0131klamas\u0131nda s\xF6zl\xFCk ifadesi kullan\u0131lamaz",
|
|
@@ -35063,7 +35137,6 @@ var require_package_nls_tr = __commonJS({
|
|
|
35063
35137
|
paramSpecDefaultNotTuple: "ParamSpec varsay\u0131lan de\u011Feri i\xE7in \xFC\xE7 nokta, demet ifadesi veya ParamSpec bekleniyordu",
|
|
35064
35138
|
paramSpecFirstArg: "\u0130lk ba\u011F\u0131ms\u0131z de\u011Fi\u015Fken olarak ParamSpec ad\u0131 bekleniyordu",
|
|
35065
35139
|
paramSpecKwargsUsage: `ParamSpec'in "kwargs" \xFCyesi yaln\u0131zca *kwargs parametresiyle kullan\u0131ld\u0131\u011F\u0131nda ge\xE7erlidir`,
|
|
35066
|
-
paramSpecNotBound: '"{type}" parametre belirtimi ba\u011Fl\u0131 bir de\u011Fere sahip de\u011Fil',
|
|
35067
35140
|
paramSpecNotUsedByOuterScope: '"{name}" adl\u0131 ParamSpec bu ba\u011Flamda bir anlam ifade etmiyor',
|
|
35068
35141
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" d\xF6n\xFC\u015F t\xFCr\xFC i\xE7inde \xE7a\u011Fr\u0131labilir kapsam\u0131na al\u0131nd\u0131 ve i\u015Flev g\xF6vdesinde ba\u015Fvurulamaz',
|
|
35069
35142
|
paramSpecUnknownArg: "ParamSpec birden fazla ba\u011F\u0131ms\u0131z de\u011Fi\u015Fkeni desteklemiyor",
|
|
@@ -35577,8 +35650,14 @@ var require_package_nls_zh_cn = __commonJS({
|
|
|
35577
35650
|
delTargetExpr: "\u65E0\u6CD5\u5220\u9664\u8868\u8FBE\u5F0F",
|
|
35578
35651
|
deprecatedClass: '\u7C7B"{name}"\u5DF2\u5F03\u7528',
|
|
35579
35652
|
deprecatedConstructor: '\u7C7B"{name}"\u7684\u6784\u9020\u51FD\u6570\u5DF2\u5F03\u7528',
|
|
35653
|
+
deprecatedDescriptorDeleter: "\u5DF2\u5F03\u7528\u63CF\u8FF0\u7B26\u201C{name}\u201D\u7684\u201C__delete__\u201D\u65B9\u6CD5",
|
|
35654
|
+
deprecatedDescriptorGetter: "\u5DF2\u5F03\u7528\u63CF\u8FF0\u7B26\u201C{name}\u201D\u7684\u201C__get__\u201D\u65B9\u6CD5",
|
|
35655
|
+
deprecatedDescriptorSetter: "\u5DF2\u5F03\u7528\u63CF\u8FF0\u7B26\u201C{name}\u201D\u7684\u201C__set__\u201D\u65B9\u6CD5",
|
|
35580
35656
|
deprecatedFunction: "\u51FD\u6570\u201C{name}\u201D\u5DF2\u5F03\u7528",
|
|
35581
35657
|
deprecatedMethod: "\u7C7B\u201C{className}\u201D\u4E2D\u7684\u201C{name}\u201D\u65B9\u6CD5\u5DF2\u5F03\u7528",
|
|
35658
|
+
deprecatedPropertyDeleter: "\u5DF2\u5F03\u7528\u5C5E\u6027\u201C{name}\u201D\u7684\u5220\u9664\u7A0B\u5E8F",
|
|
35659
|
+
deprecatedPropertyGetter: "\u5DF2\u5F03\u7528\u5C5E\u6027\u201C{name}\u201D\u7684 getter",
|
|
35660
|
+
deprecatedPropertySetter: "\u5DF2\u5F03\u7528\u5C5E\u6027\u201C{name}\u201D\u7684\u8D44\u6E90\u5E93",
|
|
35582
35661
|
deprecatedType: "\u81EA Python {version} \u8D77\uFF0C\u6B64\u7C7B\u578B\u5DF2\u5F03\u7528\uFF1B\u8BF7\u6539\u7528\u201C{replacement}\u201D",
|
|
35583
35662
|
dictExpandIllegalInComprehension: "\u7406\u89E3\u4E2D\u4E0D\u5141\u8BB8\u5B57\u5178\u6269\u5C55",
|
|
35584
35663
|
dictInAnnotation: "\u7C7B\u578B\u6279\u6CE8\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5B57\u5178\u8868\u8FBE\u5F0F",
|
|
@@ -35807,7 +35886,6 @@ var require_package_nls_zh_cn = __commonJS({
|
|
|
35807
35886
|
paramSpecDefaultNotTuple: "ParamSpec \u7684\u9ED8\u8BA4\u503C\u5E94\u4E3A\u7701\u7565\u53F7\u3001\u5143\u7EC4\u8868\u8FBE\u5F0F\u6216 ParamSpec",
|
|
35808
35887
|
paramSpecFirstArg: "ParamSpec \u4F5C\u4E3A\u7B2C\u4E00\u4E2A\u53C2\u6570\u7684\u9884\u671F\u540D\u79F0",
|
|
35809
35888
|
paramSpecKwargsUsage: "ParamSpec \u7684\u201Ckwargs\u201D\u6210\u5458\u4EC5\u5728\u4E0E **kwargs \u53C2\u6570\u4E00\u8D77\u4F7F\u7528\u65F6\u6709\u6548",
|
|
35810
|
-
paramSpecNotBound: "\u53C2\u6570\u89C4\u8303\u201C{type}\u201D\u6CA1\u6709\u7ED1\u5B9A\u503C",
|
|
35811
35889
|
paramSpecNotUsedByOuterScope: "ParamSpec\u201C{name}\u201D\u5728\u6B64\u4E0A\u4E0B\u6587\u4E2D\u6CA1\u6709\u610F\u4E49",
|
|
35812
35890
|
paramSpecScopedToReturnType: 'ParamSpec "{name}"\u5728\u8FD4\u56DE\u7C7B\u578B\u5185\u7684\u4F5C\u7528\u57DF\u4E3A\u53EF\u8C03\u7528\uFF0C\u4E0D\u80FD\u5728\u51FD\u6570\u4F53\u4E2D\u5F15\u7528',
|
|
35813
35891
|
paramSpecUnknownArg: "ParamSpec \u4E0D\u652F\u6301\u591A\u4E2A\u53C2\u6570",
|
|
@@ -36321,8 +36399,14 @@ var require_package_nls_zh_tw = __commonJS({
|
|
|
36321
36399
|
delTargetExpr: "\u7121\u6CD5\u522A\u9664\u904B\u7B97\u5F0F",
|
|
36322
36400
|
deprecatedClass: '\u985E\u5225 "{name}" \u5DF2\u6DD8\u6C70',
|
|
36323
36401
|
deprecatedConstructor: '\u985E\u5225 "{name}" \u7684\u5EFA\u69CB\u51FD\u5F0F\u5DF2\u53D6\u4EE3',
|
|
36402
|
+
deprecatedDescriptorDeleter: '\u63CF\u8FF0\u9805 "{name}" \u7684 "__delete__" \u65B9\u6CD5\u5DF2\u88AB\u53D6\u4EE3',
|
|
36403
|
+
deprecatedDescriptorGetter: '\u63CF\u8FF0\u9805 "{name}" \u7684 "__get__" \u65B9\u6CD5\u5DF2\u88AB\u53D6\u4EE3',
|
|
36404
|
+
deprecatedDescriptorSetter: '\u63CF\u8FF0\u9805 "{name}" \u7684 "__set__" \u65B9\u6CD5\u5DF2\u88AB\u53D6\u4EE3',
|
|
36324
36405
|
deprecatedFunction: '\u51FD\u5F0F "{name}" \u5DF2\u53D6\u4EE3',
|
|
36325
36406
|
deprecatedMethod: '\u985E\u5225 "{className}" \u4E2D\u7684\u65B9\u6CD5 "{name}" \u5DF2\u53D6\u4EE3',
|
|
36407
|
+
deprecatedPropertyDeleter: '\u5C6C\u6027 "{name}" \u7684 deleter \u5DF2\u88AB\u53D6\u4EE3',
|
|
36408
|
+
deprecatedPropertyGetter: '\u5C6C\u6027 "{name}" \u7684 getter \u5DF2\u88AB\u53D6\u4EE3',
|
|
36409
|
+
deprecatedPropertySetter: '\u5C6C\u6027 "{name}" \u7684 setter \u5DF2\u88AB\u53D6\u4EE3',
|
|
36326
36410
|
deprecatedType: '\u6B64\u985E\u578B\u5DF2\u96A8\u8457 Python {version} \u53D6\u4EE3; \u8ACB\u6539\u70BA\u4F7F\u7528 "{replacement}"',
|
|
36327
36411
|
dictExpandIllegalInComprehension: "\u7406\u89E3\u4E2D\u4E0D\u5141\u8A31\u5B57\u5178\u64F4\u5145",
|
|
36328
36412
|
dictInAnnotation: "\u985E\u578B\u8A3B\u91CB\u4E2D\u4E0D\u5141\u8A31\u5B57\u5178\u904B\u7B97\u5F0F",
|
|
@@ -36551,7 +36635,6 @@ var require_package_nls_zh_tw = __commonJS({
|
|
|
36551
36635
|
paramSpecDefaultNotTuple: "ParamSpec \u7684\u9810\u8A2D\u503C\u5FC5\u9808\u662F\u7701\u7565\u7B26\u865F\u3001\u5143\u7D44\u904B\u7B97\u5F0F\u6216 ParamSpec",
|
|
36552
36636
|
paramSpecFirstArg: "\u61C9\u4EE5 ParamSpec \u7684\u540D\u7A31\u4F5C\u70BA\u7B2C\u4E00\u500B\u5F15\u6578",
|
|
36553
36637
|
paramSpecKwargsUsage: 'ParamSpec \u7684 "kwargs" \u6210\u54E1\u53EA\u6709\u5728\u8207 **kwargs \u53C3\u6578\u642D\u914D\u4F7F\u7528\u6642\u6709\u6548',
|
|
36554
|
-
paramSpecNotBound: '\u53C3\u6578\u898F\u683C "{type}" \u6C92\u6709\u7E6B\u7D50\u503C',
|
|
36555
36638
|
paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" \u5728\u6B64\u5167\u5BB9\u4E2D\u6C92\u6709\u610F\u7FA9',
|
|
36556
36639
|
paramSpecScopedToReturnType: 'ParamSpec "{name}" \u7684\u7BC4\u570D\u70BA\u50B3\u56DE\u578B\u5225\u5167\u7684\u53EF\u547C\u53EB\u9805\u76EE\uFF0C\u7121\u6CD5\u5728\u51FD\u5F0F\u4E3B\u9AD4\u4E2D\u53C3\u8003',
|
|
36557
36640
|
paramSpecUnknownArg: "ParamSpec \u4E0D\u652F\u63F4\u4E00\u500B\u4EE5\u4E0A\u7684\u5F15\u6578",
|
|
@@ -37436,7 +37519,6 @@ var require_localize = __commonJS({
|
|
|
37436
37519
|
Diagnostic6.paramSpecDefaultNotTuple = () => getRawString("Diagnostic.paramSpecDefaultNotTuple");
|
|
37437
37520
|
Diagnostic6.paramSpecFirstArg = () => getRawString("Diagnostic.paramSpecFirstArg");
|
|
37438
37521
|
Diagnostic6.paramSpecKwargsUsage = () => getRawString("Diagnostic.paramSpecKwargsUsage");
|
|
37439
|
-
Diagnostic6.paramSpecNotBound = () => new ParameterizedString(getRawString("Diagnostic.paramSpecNotBound"));
|
|
37440
37522
|
Diagnostic6.paramSpecNotUsedByOuterScope = () => new ParameterizedString(getRawString("Diagnostic.paramSpecNotUsedByOuterScope"));
|
|
37441
37523
|
Diagnostic6.paramSpecScopedToReturnType = () => new ParameterizedString(getRawString("Diagnostic.paramSpecScopedToReturnType"));
|
|
37442
37524
|
Diagnostic6.paramSpecUnknownArg = () => getRawString("Diagnostic.paramSpecUnknownArg");
|
|
@@ -37729,6 +37811,7 @@ var require_localize = __commonJS({
|
|
|
37729
37811
|
DiagnosticAddendum2.memberSetClassVar = () => new ParameterizedString(getRawString("DiagnosticAddendum.memberSetClassVar"));
|
|
37730
37812
|
DiagnosticAddendum2.memberTypeMismatch = () => new ParameterizedString(getRawString("DiagnosticAddendum.memberTypeMismatch"));
|
|
37731
37813
|
DiagnosticAddendum2.memberUnknown = () => new ParameterizedString(getRawString("DiagnosticAddendum.memberUnknown"));
|
|
37814
|
+
DiagnosticAddendum2.metaclassConflict = () => new ParameterizedString(getRawString("DiagnosticAddendum.metaclassConflict"));
|
|
37732
37815
|
DiagnosticAddendum2.missingProtocolMember = () => new ParameterizedString(getRawString("DiagnosticAddendum.missingProtocolMember"));
|
|
37733
37816
|
DiagnosticAddendum2.missingGetter = () => getRawString("DiagnosticAddendum.missingGetter");
|
|
37734
37817
|
DiagnosticAddendum2.missingSetter = () => getRawString("DiagnosticAddendum.missingSetter");
|
|
@@ -38314,10 +38397,12 @@ var require_constraintSolver = __commonJS({
|
|
|
38314
38397
|
console.log(`${indent}destType: ${evaluator.printType(destType)}`);
|
|
38315
38398
|
console.log(`${indent}srcType: ${evaluator.printType(srcType)}`);
|
|
38316
38399
|
console.log(`${indent}flags: ${flags}`);
|
|
38317
|
-
console.log(`${indent}
|
|
38400
|
+
console.log(`${indent}scopes: ${(typeVarContext.getSolveForScopes() || []).join(", ")}`);
|
|
38401
|
+
console.log(`${indent}pre-call context #${typeVarContext.getId()}: `);
|
|
38318
38402
|
logTypeVarContext(evaluator, typeVarContext, indent);
|
|
38319
38403
|
}
|
|
38320
38404
|
let isTypeVarInScope = true;
|
|
38405
|
+
const isInvariant = (flags & 1) !== 0;
|
|
38321
38406
|
const isContravariant = (flags & 2) !== 0;
|
|
38322
38407
|
if (!destType.scopeId) {
|
|
38323
38408
|
return true;
|
|
@@ -38329,7 +38414,7 @@ var require_constraintSolver = __commonJS({
|
|
|
38329
38414
|
if (destType.details.isParamSpec && (0, types_1.isFunction)(srcType) && types_1.FunctionType.isParamSpecValue(srcType) && types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(srcType)) {
|
|
38330
38415
|
return true;
|
|
38331
38416
|
}
|
|
38332
|
-
if ((0, types_1.isNever)(srcType) &&
|
|
38417
|
+
if ((0, types_1.isNever)(srcType) && !isInvariant) {
|
|
38333
38418
|
return true;
|
|
38334
38419
|
}
|
|
38335
38420
|
if ((flags & 512) !== 0) {
|
|
@@ -38427,7 +38512,7 @@ var require_constraintSolver = __commonJS({
|
|
|
38427
38512
|
return true;
|
|
38428
38513
|
}
|
|
38429
38514
|
if (!curEntry) {
|
|
38430
|
-
if (
|
|
38515
|
+
if (isInvariant) {
|
|
38431
38516
|
newNarrowTypeBound = adjSrcType;
|
|
38432
38517
|
newWideTypeBound = adjSrcType;
|
|
38433
38518
|
} else if (isContravariant) {
|
|
@@ -38625,7 +38710,7 @@ var require_constraintSolver = __commonJS({
|
|
|
38625
38710
|
if (logTypeVarContextUpdates) {
|
|
38626
38711
|
const indent = " ".repeat(recursionCount * 2);
|
|
38627
38712
|
console.log(`${indent}`);
|
|
38628
|
-
console.log(`${indent}post-call typeVarContext: `);
|
|
38713
|
+
console.log(`${indent}post-call context #${typeVarContext.getId()}: `);
|
|
38629
38714
|
logTypeVarContext(evaluator, typeVarContext, indent);
|
|
38630
38715
|
}
|
|
38631
38716
|
return true;
|
|
@@ -38961,6 +39046,9 @@ var require_constraintSolver = __commonJS({
|
|
|
38961
39046
|
const synthExpectedTypeArgs = types_1.ClassType.getTypeParameters(expectedType).map((typeParam, index) => {
|
|
38962
39047
|
const typeVar = types_1.TypeVarType.createInstance(`__dest${index}`);
|
|
38963
39048
|
typeVar.details.isSynthesized = true;
|
|
39049
|
+
if (typeParam.details.isParamSpec) {
|
|
39050
|
+
typeVar.details.isParamSpec = true;
|
|
39051
|
+
}
|
|
38964
39052
|
typeVar.details.declaredVariance = 2;
|
|
38965
39053
|
typeVar.scopeId = expectedTypeScopeId;
|
|
38966
39054
|
return typeVar;
|
|
@@ -38971,11 +39059,14 @@ var require_constraintSolver = __commonJS({
|
|
|
38971
39059
|
/* isTypeArgumentExplicit */
|
|
38972
39060
|
true
|
|
38973
39061
|
);
|
|
38974
|
-
const typeArgs = types_1.ClassType.getTypeParameters(type).map((
|
|
39062
|
+
const typeArgs = types_1.ClassType.getTypeParameters(type).map((typeParam, index) => {
|
|
38975
39063
|
const typeVar = types_1.TypeVarType.createInstance(`__source${index}`);
|
|
38976
39064
|
typeVar.details.isSynthesized = true;
|
|
38977
39065
|
typeVar.details.synthesizedIndex = index;
|
|
38978
39066
|
typeVar.details.isExemptFromBoundCheck = true;
|
|
39067
|
+
if (typeParam.details.isParamSpec) {
|
|
39068
|
+
typeVar.details.isParamSpec = true;
|
|
39069
|
+
}
|
|
38979
39070
|
return types_1.TypeVarType.cloneAsInScopePlaceholder(typeVar);
|
|
38980
39071
|
});
|
|
38981
39072
|
const specializedType = types_1.ClassType.cloneForSpecialization(
|
|
@@ -39000,17 +39091,22 @@ var require_constraintSolver = __commonJS({
|
|
|
39000
39091
|
synthExpectedTypeArgs.forEach((typeVar, index) => {
|
|
39001
39092
|
let synthTypeVar = syntheticTypeVarContext.getPrimarySignature().getTypeVarType(typeVar);
|
|
39002
39093
|
const otherSubtypes = [];
|
|
39003
|
-
if (synthTypeVar
|
|
39004
|
-
|
|
39005
|
-
|
|
39006
|
-
|
|
39007
|
-
|
|
39008
|
-
|
|
39009
|
-
|
|
39094
|
+
if (synthTypeVar) {
|
|
39095
|
+
if (typeVar.details.isParamSpec && (0, types_1.isFunction)(synthTypeVar)) {
|
|
39096
|
+
synthTypeVar = (0, typeUtils_1.convertParamSpecValueToType)(synthTypeVar);
|
|
39097
|
+
}
|
|
39098
|
+
if ((0, types_1.isUnion)(synthTypeVar)) {
|
|
39099
|
+
let foundSynthTypeVar;
|
|
39100
|
+
synthTypeVar.subtypes.forEach((subtype) => {
|
|
39101
|
+
if ((0, types_1.isTypeVar)(subtype) && subtype.details.isSynthesized && subtype.details.synthesizedIndex !== void 0 && !foundSynthTypeVar) {
|
|
39102
|
+
foundSynthTypeVar = subtype;
|
|
39103
|
+
} else {
|
|
39104
|
+
otherSubtypes.push(subtype);
|
|
39105
|
+
}
|
|
39106
|
+
});
|
|
39107
|
+
if (foundSynthTypeVar) {
|
|
39108
|
+
synthTypeVar = foundSynthTypeVar;
|
|
39010
39109
|
}
|
|
39011
|
-
});
|
|
39012
|
-
if (foundSynthTypeVar) {
|
|
39013
|
-
synthTypeVar = foundSynthTypeVar;
|
|
39014
39110
|
}
|
|
39015
39111
|
}
|
|
39016
39112
|
if (synthTypeVar && (0, types_1.isTypeVar)(synthTypeVar) && synthTypeVar.details.isSynthesized && synthTypeVar.details.synthesizedIndex !== void 0) {
|
|
@@ -39099,19 +39195,40 @@ var require_constraintSolver = __commonJS({
|
|
|
39099
39195
|
);
|
|
39100
39196
|
}
|
|
39101
39197
|
function logTypeVarContext(evaluator, typeVarContext, indent) {
|
|
39102
|
-
|
|
39103
|
-
|
|
39198
|
+
const signatureContextCount = typeVarContext.getSignatureContexts().length;
|
|
39199
|
+
if (signatureContextCount === 0) {
|
|
39200
|
+
console.log(`${indent} no signatures`);
|
|
39201
|
+
} else if (signatureContextCount === 1) {
|
|
39202
|
+
logTypeVarSignatureContext(evaluator, typeVarContext.getSignatureContexts()[0], `${indent} `);
|
|
39104
39203
|
} else {
|
|
39105
|
-
typeVarContext.doForEachSignatureContext((
|
|
39106
|
-
console.log(`${indent}
|
|
39107
|
-
|
|
39108
|
-
console.log(`${indent} ${entry.typeVar.details.name}:`);
|
|
39109
|
-
console.log(`${indent} Narrow: ${entry.narrowBound ? evaluator.printType(entry.narrowBound) : "?"}`);
|
|
39110
|
-
console.log(`${indent} Wide : ${entry.wideBound ? evaluator.printType(entry.wideBound) : "?"}`);
|
|
39111
|
-
});
|
|
39204
|
+
typeVarContext.doForEachSignatureContext((context, signatureIndex) => {
|
|
39205
|
+
console.log(`${indent} signature ${signatureIndex}`);
|
|
39206
|
+
logTypeVarSignatureContext(evaluator, context, `${indent} `);
|
|
39112
39207
|
});
|
|
39113
39208
|
}
|
|
39114
39209
|
}
|
|
39210
|
+
function logTypeVarSignatureContext(evaluator, context, indent) {
|
|
39211
|
+
let loggedConstraint = false;
|
|
39212
|
+
context.getTypeVars().forEach((entry) => {
|
|
39213
|
+
const typeVarName = `${indent}${entry.typeVar.details.name}`;
|
|
39214
|
+
if (entry.narrowBound && entry.wideBound && (0, types_1.isTypeSame)(entry.narrowBound, entry.wideBound)) {
|
|
39215
|
+
console.log(`${typeVarName} = ${evaluator.printType(entry.narrowBound)}`);
|
|
39216
|
+
loggedConstraint = true;
|
|
39217
|
+
} else {
|
|
39218
|
+
if (entry.narrowBound) {
|
|
39219
|
+
console.log(`${typeVarName} \u2264 ${evaluator.printType(entry.narrowBound)}`);
|
|
39220
|
+
loggedConstraint = true;
|
|
39221
|
+
}
|
|
39222
|
+
if (entry.wideBound) {
|
|
39223
|
+
console.log(`${typeVarName} \u2265 ${evaluator.printType(entry.wideBound)}`);
|
|
39224
|
+
loggedConstraint = true;
|
|
39225
|
+
}
|
|
39226
|
+
}
|
|
39227
|
+
});
|
|
39228
|
+
if (!loggedConstraint) {
|
|
39229
|
+
console.log(`${indent}no constraints`);
|
|
39230
|
+
}
|
|
39231
|
+
}
|
|
39115
39232
|
}
|
|
39116
39233
|
});
|
|
39117
39234
|
|
|
@@ -39361,7 +39478,6 @@ var require_typedDicts = __commonJS({
|
|
|
39361
39478
|
const entries = getTypedDictMembersForClass(evaluator, classType);
|
|
39362
39479
|
let allEntriesAreNotRequired = true;
|
|
39363
39480
|
let allEntriesAreReadOnly = true;
|
|
39364
|
-
let allEntriesAreWritable = true;
|
|
39365
39481
|
entries.forEach((entry, name) => {
|
|
39366
39482
|
types_1.FunctionType.addParameter(initOverride1, {
|
|
39367
39483
|
category: 0,
|
|
@@ -39380,9 +39496,7 @@ var require_typedDicts = __commonJS({
|
|
|
39380
39496
|
if (entry.isRequired) {
|
|
39381
39497
|
allEntriesAreNotRequired = false;
|
|
39382
39498
|
}
|
|
39383
|
-
if (entry.isReadOnly) {
|
|
39384
|
-
allEntriesAreWritable = false;
|
|
39385
|
-
} else {
|
|
39499
|
+
if (!entry.isReadOnly) {
|
|
39386
39500
|
allEntriesAreReadOnly = false;
|
|
39387
39501
|
}
|
|
39388
39502
|
});
|
|
@@ -39521,21 +39635,92 @@ var require_typedDicts = __commonJS({
|
|
|
39521
39635
|
delItemOverload.details.declaredReturnType = types_1.NoneType.createInstance();
|
|
39522
39636
|
return delItemOverload;
|
|
39523
39637
|
}, createUpdateMethod = function() {
|
|
39524
|
-
const
|
|
39525
|
-
|
|
39526
|
-
|
|
39638
|
+
const updateMethod1 = types_1.FunctionType.createSynthesizedInstance(
|
|
39639
|
+
"update",
|
|
39640
|
+
256
|
|
39641
|
+
/* Overloaded */
|
|
39642
|
+
);
|
|
39643
|
+
types_1.FunctionType.addParameter(updateMethod1, selfParam);
|
|
39644
|
+
const updateMethod2 = types_1.FunctionType.createSynthesizedInstance(
|
|
39645
|
+
"update",
|
|
39646
|
+
256
|
|
39647
|
+
/* Overloaded */
|
|
39648
|
+
);
|
|
39649
|
+
types_1.FunctionType.addParameter(updateMethod2, selfParam);
|
|
39650
|
+
const updateMethod3 = types_1.FunctionType.createSynthesizedInstance(
|
|
39651
|
+
"update",
|
|
39652
|
+
256
|
|
39653
|
+
/* Overloaded */
|
|
39654
|
+
);
|
|
39655
|
+
types_1.FunctionType.addParameter(updateMethod3, selfParam);
|
|
39656
|
+
types_1.FunctionType.addParameter(updateMethod1, {
|
|
39527
39657
|
category: 0,
|
|
39528
39658
|
name: "__m",
|
|
39529
39659
|
hasDeclaredType: true,
|
|
39530
|
-
type:
|
|
39660
|
+
type: allEntriesAreReadOnly ? types_1.NeverType.createNever() : types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForPartialTypedDict(classType))
|
|
39531
39661
|
});
|
|
39532
|
-
types_1.FunctionType.addParameter(
|
|
39662
|
+
types_1.FunctionType.addParameter(updateMethod1, {
|
|
39533
39663
|
category: 0,
|
|
39534
39664
|
name: "",
|
|
39535
39665
|
type: types_1.AnyType.create()
|
|
39536
39666
|
});
|
|
39537
|
-
|
|
39538
|
-
|
|
39667
|
+
types_1.FunctionType.addParameter(updateMethod3, {
|
|
39668
|
+
category: 1,
|
|
39669
|
+
name: "",
|
|
39670
|
+
hasDeclaredType: false,
|
|
39671
|
+
type: types_1.UnknownType.create()
|
|
39672
|
+
});
|
|
39673
|
+
updateMethod1.details.declaredReturnType = types_1.NoneType.createInstance();
|
|
39674
|
+
updateMethod2.details.declaredReturnType = types_1.NoneType.createInstance();
|
|
39675
|
+
updateMethod3.details.declaredReturnType = types_1.NoneType.createInstance();
|
|
39676
|
+
const tuplesToCombine = [];
|
|
39677
|
+
const tupleClass = evaluator.getBuiltInType(node, "tuple");
|
|
39678
|
+
entries.forEach((entry, name) => {
|
|
39679
|
+
if (!entry.isReadOnly) {
|
|
39680
|
+
if (tupleClass && (0, types_1.isInstantiableClass)(tupleClass) && strClass && (0, types_1.isInstantiableClass)(strClass)) {
|
|
39681
|
+
const tupleType = (0, typeUtils_1.specializeTupleClass)(types_1.ClassType.cloneAsInstance(tupleClass), [
|
|
39682
|
+
{
|
|
39683
|
+
type: types_1.ClassType.cloneWithLiteral(types_1.ClassType.cloneAsInstance(strClass), name),
|
|
39684
|
+
isUnbounded: false
|
|
39685
|
+
},
|
|
39686
|
+
{ type: entry.valueType, isUnbounded: false }
|
|
39687
|
+
]);
|
|
39688
|
+
tuplesToCombine.push(tupleType);
|
|
39689
|
+
}
|
|
39690
|
+
types_1.FunctionType.addParameter(updateMethod3, {
|
|
39691
|
+
category: 0,
|
|
39692
|
+
name,
|
|
39693
|
+
hasDeclaredType: true,
|
|
39694
|
+
hasDefault: true,
|
|
39695
|
+
defaultType: types_1.AnyType.create(
|
|
39696
|
+
/* isEllipsis */
|
|
39697
|
+
true
|
|
39698
|
+
),
|
|
39699
|
+
type: entry.valueType
|
|
39700
|
+
});
|
|
39701
|
+
}
|
|
39702
|
+
});
|
|
39703
|
+
const iterableClass = evaluator.getTypingType(node, "Iterable");
|
|
39704
|
+
if (iterableClass && (0, types_1.isInstantiableClass)(iterableClass)) {
|
|
39705
|
+
const iterableType = types_1.ClassType.cloneAsInstance(iterableClass);
|
|
39706
|
+
types_1.FunctionType.addParameter(updateMethod2, {
|
|
39707
|
+
category: 0,
|
|
39708
|
+
name: "__m",
|
|
39709
|
+
hasDeclaredType: true,
|
|
39710
|
+
type: types_1.ClassType.cloneForSpecialization(
|
|
39711
|
+
iterableType,
|
|
39712
|
+
[(0, types_1.combineTypes)(tuplesToCombine)],
|
|
39713
|
+
/* isTypeArgumentExplicit */
|
|
39714
|
+
true
|
|
39715
|
+
)
|
|
39716
|
+
});
|
|
39717
|
+
}
|
|
39718
|
+
types_1.FunctionType.addParameter(updateMethod2, {
|
|
39719
|
+
category: 0,
|
|
39720
|
+
name: "",
|
|
39721
|
+
type: types_1.AnyType.create()
|
|
39722
|
+
});
|
|
39723
|
+
return types_1.OverloadedFunctionType.create([updateMethod1, updateMethod2, updateMethod3]);
|
|
39539
39724
|
};
|
|
39540
39725
|
const selfParam = {
|
|
39541
39726
|
category: 0,
|
|
@@ -39655,6 +39840,14 @@ var require_typedDicts = __commonJS({
|
|
|
39655
39840
|
classType.details.typedDictEntries.forEach((value, key) => {
|
|
39656
39841
|
const tdEntry = { ...value };
|
|
39657
39842
|
tdEntry.valueType = (0, typeUtils_1.applySolvedTypeVars)(tdEntry.valueType, typeVarContext);
|
|
39843
|
+
if (classType.isTypedDictPartial) {
|
|
39844
|
+
tdEntry.isRequired = false;
|
|
39845
|
+
if (tdEntry.isReadOnly) {
|
|
39846
|
+
tdEntry.valueType = types_1.NeverType.createNever();
|
|
39847
|
+
} else {
|
|
39848
|
+
tdEntry.isReadOnly = true;
|
|
39849
|
+
}
|
|
39850
|
+
}
|
|
39658
39851
|
entries.set(key, tdEntry);
|
|
39659
39852
|
});
|
|
39660
39853
|
if (allowNarrowed && classType.typedDictNarrowedEntries) {
|
|
@@ -39664,11 +39857,6 @@ var require_typedDicts = __commonJS({
|
|
|
39664
39857
|
entries.set(key, tdEntry);
|
|
39665
39858
|
});
|
|
39666
39859
|
}
|
|
39667
|
-
if (classType.isTypedDictPartial) {
|
|
39668
|
-
entries.forEach((entry) => {
|
|
39669
|
-
entry.isRequired = false;
|
|
39670
|
-
});
|
|
39671
|
-
}
|
|
39672
39860
|
return entries;
|
|
39673
39861
|
}
|
|
39674
39862
|
exports.getTypedDictMembersForClass = getTypedDictMembersForClass;
|
|
@@ -39779,7 +39967,6 @@ var require_typedDicts = __commonJS({
|
|
|
39779
39967
|
}
|
|
39780
39968
|
function assignTypedDictToTypedDict(evaluator, destType, srcType, diag, typeVarContext, flags, recursionCount = 0) {
|
|
39781
39969
|
let typesAreConsistent = true;
|
|
39782
|
-
const isDestPartial = !!destType.isTypedDictPartial;
|
|
39783
39970
|
const destEntries = getTypedDictMembersForClass(evaluator, destType);
|
|
39784
39971
|
const srcEntries = getTypedDictMembersForClass(
|
|
39785
39972
|
evaluator,
|
|
@@ -39790,15 +39977,33 @@ var require_typedDicts = __commonJS({
|
|
|
39790
39977
|
destEntries.forEach((destEntry, name) => {
|
|
39791
39978
|
const srcEntry = srcEntries.get(name);
|
|
39792
39979
|
if (!srcEntry) {
|
|
39793
|
-
if (!
|
|
39980
|
+
if (destEntry.isRequired || !destEntry.isReadOnly) {
|
|
39794
39981
|
diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.Localizer.DiagnosticAddendum.typedDictFieldMissing().format({
|
|
39795
39982
|
name,
|
|
39796
39983
|
type: evaluator.printType(srcType)
|
|
39797
39984
|
}));
|
|
39798
39985
|
typesAreConsistent = false;
|
|
39986
|
+
} else {
|
|
39987
|
+
const objType = evaluator.getObjectType();
|
|
39988
|
+
if (objType && (0, types_1.isClassInstance)(objType)) {
|
|
39989
|
+
const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
|
|
39990
|
+
if (!evaluator.assignType(
|
|
39991
|
+
destEntry.valueType,
|
|
39992
|
+
objType,
|
|
39993
|
+
subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
|
|
39994
|
+
typeVarContext,
|
|
39995
|
+
/* srcTypeVarContext */
|
|
39996
|
+
void 0,
|
|
39997
|
+
flags,
|
|
39998
|
+
recursionCount
|
|
39999
|
+
)) {
|
|
40000
|
+
subDiag === null || subDiag === void 0 ? void 0 : subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
|
|
40001
|
+
typesAreConsistent = false;
|
|
40002
|
+
}
|
|
40003
|
+
}
|
|
39799
40004
|
}
|
|
39800
40005
|
} else {
|
|
39801
|
-
if (destEntry.isRequired !== srcEntry.isRequired && !destEntry.isReadOnly
|
|
40006
|
+
if (destEntry.isRequired !== srcEntry.isRequired && !destEntry.isReadOnly) {
|
|
39802
40007
|
const message = destEntry.isRequired ? localize_1.Localizer.DiagnosticAddendum.typedDictFieldRequired() : localize_1.Localizer.DiagnosticAddendum.typedDictFieldNotRequired();
|
|
39803
40008
|
diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(message.format({
|
|
39804
40009
|
name,
|
|
@@ -39806,7 +40011,7 @@ var require_typedDicts = __commonJS({
|
|
|
39806
40011
|
}));
|
|
39807
40012
|
typesAreConsistent = false;
|
|
39808
40013
|
}
|
|
39809
|
-
if (!destEntry.isReadOnly && srcEntry.isReadOnly
|
|
40014
|
+
if (!destEntry.isReadOnly && srcEntry.isReadOnly) {
|
|
39810
40015
|
diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.Localizer.DiagnosticAddendum.typedDictFieldNotReadOnly().format({
|
|
39811
40016
|
name,
|
|
39812
40017
|
type: evaluator.printType(destType)
|
|
@@ -39814,6 +40019,10 @@ var require_typedDicts = __commonJS({
|
|
|
39814
40019
|
typesAreConsistent = false;
|
|
39815
40020
|
}
|
|
39816
40021
|
const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
|
|
40022
|
+
let adjustedFlags = flags;
|
|
40023
|
+
if (!destEntry.isReadOnly) {
|
|
40024
|
+
adjustedFlags |= 1;
|
|
40025
|
+
}
|
|
39817
40026
|
if (!evaluator.assignType(
|
|
39818
40027
|
destEntry.valueType,
|
|
39819
40028
|
srcEntry.valueType,
|
|
@@ -39821,7 +40030,7 @@ var require_typedDicts = __commonJS({
|
|
|
39821
40030
|
typeVarContext,
|
|
39822
40031
|
/* srcTypeVarContext */
|
|
39823
40032
|
void 0,
|
|
39824
|
-
|
|
40033
|
+
adjustedFlags,
|
|
39825
40034
|
recursionCount
|
|
39826
40035
|
)) {
|
|
39827
40036
|
subDiag === null || subDiag === void 0 ? void 0 : subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
|
|
@@ -40361,7 +40570,7 @@ var require_typeGuards = __commonJS({
|
|
|
40361
40570
|
}
|
|
40362
40571
|
}
|
|
40363
40572
|
}
|
|
40364
|
-
if (equalsOrNotEqualsOperator && testExpression.leftExpression.nodeType === 9 && testExpression.leftExpression.arguments.length === 1
|
|
40573
|
+
if (equalsOrNotEqualsOperator && testExpression.leftExpression.nodeType === 9 && testExpression.leftExpression.arguments.length === 1) {
|
|
40365
40574
|
const arg0Expr = testExpression.leftExpression.arguments[0].valueExpression;
|
|
40366
40575
|
if (ParseTreeUtils.isMatchingExpression(reference, arg0Expr)) {
|
|
40367
40576
|
const callTypeResult = evaluator.getTypeOfExpression(
|
|
@@ -40371,12 +40580,14 @@ var require_typeGuards = __commonJS({
|
|
|
40371
40580
|
);
|
|
40372
40581
|
const callType = callTypeResult.type;
|
|
40373
40582
|
if ((0, types_1.isFunction)(callType) && callType.details.fullName === "builtins.len") {
|
|
40374
|
-
const
|
|
40375
|
-
|
|
40583
|
+
const rightTypeResult = evaluator.getTypeOfExpression(testExpression.rightExpression);
|
|
40584
|
+
const rightType = rightTypeResult.type;
|
|
40585
|
+
if ((0, types_1.isClassInstance)(rightType) && typeof rightType.literalValue === "number" && rightType.literalValue >= 0) {
|
|
40586
|
+
const tupleLength = rightType.literalValue;
|
|
40376
40587
|
return (type) => {
|
|
40377
40588
|
return {
|
|
40378
40589
|
type: narrowTypeForTupleLength(evaluator, type, tupleLength, adjIsPositiveTest),
|
|
40379
|
-
isIncomplete: !!callTypeResult.isIncomplete
|
|
40590
|
+
isIncomplete: !!callTypeResult.isIncomplete || !!rightTypeResult.isIncomplete
|
|
40380
40591
|
};
|
|
40381
40592
|
};
|
|
40382
40593
|
}
|
|
@@ -40923,8 +41134,17 @@ var require_typeGuards = __commonJS({
|
|
|
40923
41134
|
let foundSuperclass = false;
|
|
40924
41135
|
let isClassRelationshipIndeterminate = false;
|
|
40925
41136
|
for (const filterType of classTypeList) {
|
|
40926
|
-
|
|
41137
|
+
let concreteFilterType = evaluator.makeTopLevelTypeVarsConcrete(filterType);
|
|
40927
41138
|
if ((0, types_1.isInstantiableClass)(concreteFilterType)) {
|
|
41139
|
+
if (concreteFilterType.typeArguments && !concreteFilterType.isTypeArgumentExplicit) {
|
|
41140
|
+
concreteFilterType = (0, typeUtils_1.specializeWithUnknown)(types_1.ClassType.cloneForSpecialization(
|
|
41141
|
+
concreteFilterType,
|
|
41142
|
+
/* typeArguments */
|
|
41143
|
+
void 0,
|
|
41144
|
+
/* isTypeArgumentExplicit */
|
|
41145
|
+
false
|
|
41146
|
+
));
|
|
41147
|
+
}
|
|
40928
41148
|
const filterIsSuperclass = isIsinstanceFilterSuperclass(evaluator, varType, concreteVarType, filterType, concreteFilterType, isInstanceCheck);
|
|
40929
41149
|
const filterIsSubclass = isIsinstanceFilterSubclass(evaluator, concreteVarType, concreteFilterType, isInstanceCheck);
|
|
40930
41150
|
if (filterIsSuperclass) {
|
|
@@ -40939,7 +41159,7 @@ var require_typeGuards = __commonJS({
|
|
|
40939
41159
|
} else if (filterIsSubclass) {
|
|
40940
41160
|
if (evaluator.assignType(
|
|
40941
41161
|
concreteVarType,
|
|
40942
|
-
|
|
41162
|
+
concreteFilterType,
|
|
40943
41163
|
/* diag */
|
|
40944
41164
|
void 0,
|
|
40945
41165
|
/* destTypeVarContext */
|
|
@@ -41157,6 +41377,12 @@ var require_typeGuards = __commonJS({
|
|
|
41157
41377
|
}
|
|
41158
41378
|
return filteredTypes;
|
|
41159
41379
|
};
|
|
41380
|
+
const classListContainsNoneType = () => classTypeList.some((t) => {
|
|
41381
|
+
if ((0, types_1.isNoneTypeClass)(t)) {
|
|
41382
|
+
return true;
|
|
41383
|
+
}
|
|
41384
|
+
return (0, types_1.isInstantiableClass)(t) && types_1.ClassType.isBuiltIn(t, "NoneType");
|
|
41385
|
+
});
|
|
41160
41386
|
const anyOrUnknownSubstitutions = [];
|
|
41161
41387
|
const anyOrUnknown = [];
|
|
41162
41388
|
const filteredType = evaluator.mapSubtypesExpandTypeVars(
|
|
@@ -41177,17 +41403,7 @@ var require_typeGuards = __commonJS({
|
|
|
41177
41403
|
}
|
|
41178
41404
|
if (isInstanceCheck) {
|
|
41179
41405
|
if ((0, types_1.isNoneInstance)(subtype)) {
|
|
41180
|
-
|
|
41181
|
-
if ((0, types_1.isNoneTypeClass)(t)) {
|
|
41182
|
-
return true;
|
|
41183
|
-
}
|
|
41184
|
-
return (0, types_1.isInstantiableClass)(t) && types_1.ClassType.isBuiltIn(t, "NoneType");
|
|
41185
|
-
});
|
|
41186
|
-
if (isPositiveTest) {
|
|
41187
|
-
return containsNoneType ? subtype : void 0;
|
|
41188
|
-
} else {
|
|
41189
|
-
return containsNoneType ? void 0 : subtype;
|
|
41190
|
-
}
|
|
41406
|
+
return classListContainsNoneType() === isPositiveTest ? subtype : void 0;
|
|
41191
41407
|
}
|
|
41192
41408
|
if ((0, types_1.isModule)(subtype) || (0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "ModuleType")) {
|
|
41193
41409
|
if (isPositiveTest) {
|
|
@@ -41215,6 +41431,9 @@ var require_typeGuards = __commonJS({
|
|
|
41215
41431
|
}
|
|
41216
41432
|
}
|
|
41217
41433
|
} else {
|
|
41434
|
+
if ((0, types_1.isNoneTypeClass)(subtype)) {
|
|
41435
|
+
return classListContainsNoneType() === isPositiveTest ? subtype : void 0;
|
|
41436
|
+
}
|
|
41218
41437
|
if ((0, types_1.isClass)(subtype)) {
|
|
41219
41438
|
if ((0, types_1.isInstantiableClass)(subtype)) {
|
|
41220
41439
|
return (0, types_1.combineTypes)(filterClassType(unexpandedSubtype, subtype, (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
|
|
@@ -41909,6 +42128,9 @@ var require_patternMatching = __commonJS({
|
|
|
41909
42128
|
}
|
|
41910
42129
|
}
|
|
41911
42130
|
});
|
|
42131
|
+
if (pattern.entries.length === 0 && entry.entryTypes.length > 0) {
|
|
42132
|
+
narrowedEntryTypes.push((0, types_1.combineTypes)(entry.entryTypes));
|
|
42133
|
+
}
|
|
41912
42134
|
if (!isPositiveTest) {
|
|
41913
42135
|
if (isDefiniteMatch) {
|
|
41914
42136
|
return false;
|
|
@@ -45048,15 +45270,13 @@ var require_constructors = __commonJS({
|
|
|
45048
45270
|
objectType,
|
|
45049
45271
|
initSubtype,
|
|
45050
45272
|
/* memberClass */
|
|
45051
|
-
void 0
|
|
45052
|
-
/* errorNode */
|
|
45053
|
-
void 0,
|
|
45054
|
-
recursionCount
|
|
45273
|
+
void 0
|
|
45055
45274
|
);
|
|
45056
45275
|
if (constructorFunction2) {
|
|
45057
45276
|
constructorFunction2 = types_1.FunctionType.clone(constructorFunction2);
|
|
45058
45277
|
constructorFunction2.details.declaredReturnType = objectType;
|
|
45059
|
-
constructorFunction2.details.
|
|
45278
|
+
constructorFunction2.details.name = "";
|
|
45279
|
+
constructorFunction2.details.fullName = "";
|
|
45060
45280
|
if (constructorFunction2.specializedTypes) {
|
|
45061
45281
|
constructorFunction2.specializedTypes.returnType = objectType;
|
|
45062
45282
|
}
|
|
@@ -45102,9 +45322,6 @@ var require_constructors = __commonJS({
|
|
|
45102
45322
|
newSubtype,
|
|
45103
45323
|
/* memberClass */
|
|
45104
45324
|
void 0,
|
|
45105
|
-
/* errorNode */
|
|
45106
|
-
void 0,
|
|
45107
|
-
recursionCount,
|
|
45108
45325
|
/* treatConstructorAsClassMember */
|
|
45109
45326
|
true
|
|
45110
45327
|
);
|
|
@@ -52799,7 +53016,11 @@ var require_properties = __commonJS({
|
|
|
52799
53016
|
destAccessType,
|
|
52800
53017
|
/* memberClass */
|
|
52801
53018
|
void 0,
|
|
52802
|
-
/*
|
|
53019
|
+
/* treatConstructorAsClassMember */
|
|
53020
|
+
void 0,
|
|
53021
|
+
/* firstParamType */
|
|
53022
|
+
void 0,
|
|
53023
|
+
/* diag */
|
|
52803
53024
|
void 0,
|
|
52804
53025
|
recursionCount
|
|
52805
53026
|
);
|
|
@@ -52808,7 +53029,11 @@ var require_properties = __commonJS({
|
|
|
52808
53029
|
srcAccessType,
|
|
52809
53030
|
/* memberClass */
|
|
52810
53031
|
void 0,
|
|
52811
|
-
/*
|
|
53032
|
+
/* treatConstructorAsClassMember */
|
|
53033
|
+
void 0,
|
|
53034
|
+
/* firstParamType */
|
|
53035
|
+
void 0,
|
|
53036
|
+
/* diag */
|
|
52812
53037
|
void 0,
|
|
52813
53038
|
recursionCount
|
|
52814
53039
|
);
|
|
@@ -54460,10 +54685,6 @@ var require_protocols = __commonJS({
|
|
|
54460
54685
|
var maxProtocolCompatibilityCacheEntries = 32;
|
|
54461
54686
|
function assignClassToProtocol(evaluator, destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, treatSourceAsInstantiable, recursionCount) {
|
|
54462
54687
|
const enforceInvariance = (flags & 1) !== 0;
|
|
54463
|
-
if (recursionCount > types_1.maxTypeRecursionCount) {
|
|
54464
|
-
return true;
|
|
54465
|
-
}
|
|
54466
|
-
recursionCount++;
|
|
54467
54688
|
if (protocolAssignmentStack.some((entry) => {
|
|
54468
54689
|
return (0, types_1.isTypeSame)(entry.srcType, srcType) && (0, types_1.isTypeSame)(entry.destType, destType);
|
|
54469
54690
|
})) {
|
|
@@ -54632,15 +54853,17 @@ var require_protocols = __commonJS({
|
|
|
54632
54853
|
treatSourceAsInstantiable && !isMemberFromMetaclass ? srcType : types_1.ClassType.cloneAsInstance(srcType),
|
|
54633
54854
|
srcMemberType,
|
|
54634
54855
|
isMemberFromMetaclass ? void 0 : srcMemberInfo.classType,
|
|
54635
|
-
/* errorNode */
|
|
54636
|
-
void 0,
|
|
54637
|
-
recursionCount,
|
|
54638
54856
|
/* treatConstructorAsClassMember */
|
|
54639
54857
|
void 0,
|
|
54640
|
-
isMemberFromMetaclass ? srcType : void 0
|
|
54858
|
+
isMemberFromMetaclass ? srcType : void 0,
|
|
54859
|
+
diag === null || diag === void 0 ? void 0 : diag.createAddendum(),
|
|
54860
|
+
recursionCount
|
|
54641
54861
|
);
|
|
54642
54862
|
if (boundSrcFunction) {
|
|
54643
54863
|
srcMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundSrcFunction);
|
|
54864
|
+
} else {
|
|
54865
|
+
typesAreConsistent = false;
|
|
54866
|
+
return;
|
|
54644
54867
|
}
|
|
54645
54868
|
}
|
|
54646
54869
|
}
|
|
@@ -54663,12 +54886,11 @@ var require_protocols = __commonJS({
|
|
|
54663
54886
|
types_1.ClassType.cloneAsInstance(srcType),
|
|
54664
54887
|
destMemberType,
|
|
54665
54888
|
isMemberFromMetaclass ? void 0 : srcMemberInfo.classType,
|
|
54666
|
-
/* errorNode */
|
|
54667
|
-
void 0,
|
|
54668
|
-
recursionCount,
|
|
54669
54889
|
/* treatConstructorAsClassMember */
|
|
54670
54890
|
void 0,
|
|
54671
|
-
isMemberFromMetaclass ? srcType : void 0
|
|
54891
|
+
isMemberFromMetaclass ? srcType : void 0,
|
|
54892
|
+
diag,
|
|
54893
|
+
recursionCount
|
|
54672
54894
|
);
|
|
54673
54895
|
}
|
|
54674
54896
|
} else {
|
|
@@ -54676,13 +54898,19 @@ var require_protocols = __commonJS({
|
|
|
54676
54898
|
types_1.ClassType.cloneAsInstance(destType),
|
|
54677
54899
|
destMemberType,
|
|
54678
54900
|
destType,
|
|
54679
|
-
/*
|
|
54901
|
+
/* treatConstructorAsClassMember */
|
|
54680
54902
|
void 0,
|
|
54903
|
+
/* firstParamType */
|
|
54904
|
+
void 0,
|
|
54905
|
+
diag,
|
|
54681
54906
|
recursionCount
|
|
54682
54907
|
);
|
|
54683
54908
|
}
|
|
54684
54909
|
if (boundDeclaredType) {
|
|
54685
54910
|
destMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundDeclaredType);
|
|
54911
|
+
} else {
|
|
54912
|
+
typesAreConsistent = false;
|
|
54913
|
+
return;
|
|
54686
54914
|
}
|
|
54687
54915
|
}
|
|
54688
54916
|
const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
|
|
@@ -54795,16 +55023,20 @@ var require_protocols = __commonJS({
|
|
|
54795
55023
|
}
|
|
54796
55024
|
function createProtocolTypeVarContext(evaluator, destType, destTypeVarContext) {
|
|
54797
55025
|
const protocolTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
|
|
54798
|
-
let specializedDestType = destType;
|
|
54799
|
-
if (destTypeVarContext) {
|
|
54800
|
-
specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext, {
|
|
54801
|
-
useNarrowBoundOnly: true
|
|
54802
|
-
});
|
|
54803
|
-
}
|
|
54804
55026
|
destType.details.typeParameters.forEach((typeParam, index) => {
|
|
54805
|
-
|
|
54806
|
-
|
|
54807
|
-
|
|
55027
|
+
const entry = destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.getPrimarySignature().getTypeVar(typeParam);
|
|
55028
|
+
if (entry) {
|
|
55029
|
+
protocolTypeVarContext.setTypeVarType(typeParam, entry.narrowBound, entry.narrowBoundNoLiterals, entry.wideBound);
|
|
55030
|
+
} else if (destType.typeArguments && index < destType.typeArguments.length) {
|
|
55031
|
+
let typeArg = destType.typeArguments[index];
|
|
55032
|
+
let flags = 1024;
|
|
55033
|
+
let hasUnsolvedTypeVars = (0, typeUtils_1.requiresSpecialization)(typeArg);
|
|
55034
|
+
if (hasUnsolvedTypeVars && destTypeVarContext) {
|
|
55035
|
+
typeArg = (0, typeUtils_1.applySolvedTypeVars)(typeArg, destTypeVarContext, { useNarrowBoundOnly: true });
|
|
55036
|
+
flags = 0;
|
|
55037
|
+
hasUnsolvedTypeVars = (0, typeUtils_1.requiresSpecialization)(typeArg);
|
|
55038
|
+
}
|
|
55039
|
+
if (!hasUnsolvedTypeVars) {
|
|
54808
55040
|
(0, constraintSolver_1.assignTypeToTypeVar)(
|
|
54809
55041
|
evaluator,
|
|
54810
55042
|
typeParam,
|
|
@@ -54812,17 +55044,10 @@ var require_protocols = __commonJS({
|
|
|
54812
55044
|
/* diag */
|
|
54813
55045
|
void 0,
|
|
54814
55046
|
protocolTypeVarContext,
|
|
54815
|
-
|
|
54816
|
-
/* PopulatingExpectedType */
|
|
55047
|
+
flags
|
|
54817
55048
|
);
|
|
54818
55049
|
}
|
|
54819
55050
|
}
|
|
54820
|
-
if (destTypeVarContext) {
|
|
54821
|
-
const entry = destTypeVarContext.getPrimarySignature().getTypeVar(typeParam);
|
|
54822
|
-
if (entry) {
|
|
54823
|
-
protocolTypeVarContext.setTypeVarType(typeParam, entry.narrowBound, entry.narrowBoundNoLiterals, entry.wideBound);
|
|
54824
|
-
}
|
|
54825
|
-
}
|
|
54826
55051
|
});
|
|
54827
55052
|
return protocolTypeVarContext;
|
|
54828
55053
|
}
|
|
@@ -55293,8 +55518,11 @@ var require_typePrinter = __commonJS({
|
|
|
55293
55518
|
for (const sourceSubtype of typeAliasSource.subtypes) {
|
|
55294
55519
|
let unionSubtypeIndex = 0;
|
|
55295
55520
|
let foundMatch = false;
|
|
55521
|
+
const sourceSubtypeInstance = (0, typeUtils_1.convertToInstance)(sourceSubtype);
|
|
55296
55522
|
for (const unionSubtype of type.subtypes) {
|
|
55297
|
-
if ((0, types_1.isTypeSame)(
|
|
55523
|
+
if ((0, types_1.isTypeSame)(sourceSubtypeInstance, unionSubtype, {
|
|
55524
|
+
typeFlagsToHonor: 2 | 1
|
|
55525
|
+
})) {
|
|
55298
55526
|
if (!subtypeHandledSet.has(unionSubtypeIndex)) {
|
|
55299
55527
|
allSubtypesPreviouslyHandled = false;
|
|
55300
55528
|
}
|
|
@@ -57094,10 +57322,12 @@ var require_typeEvaluator = __commonJS({
|
|
|
57094
57322
|
unboundMethodType,
|
|
57095
57323
|
/* memberClass */
|
|
57096
57324
|
void 0,
|
|
57097
|
-
|
|
57325
|
+
treatConstructorAsClassMember,
|
|
57326
|
+
/* firstParamType */
|
|
57098
57327
|
void 0,
|
|
57099
|
-
|
|
57100
|
-
|
|
57328
|
+
/* diag */
|
|
57329
|
+
void 0,
|
|
57330
|
+
recursionCount
|
|
57101
57331
|
);
|
|
57102
57332
|
if (boundMethod) {
|
|
57103
57333
|
return boundMethod;
|
|
@@ -57329,13 +57559,11 @@ var require_typeEvaluator = __commonJS({
|
|
|
57329
57559
|
if (setItemMember) {
|
|
57330
57560
|
const setItemType = getTypeOfMember(setItemMember);
|
|
57331
57561
|
if ((0, types_1.isFunction)(setItemType)) {
|
|
57332
|
-
const boundFunction =
|
|
57562
|
+
const boundFunction = bindFunctionToClassOrObjectWithErrors(
|
|
57333
57563
|
baseType,
|
|
57334
57564
|
setItemType,
|
|
57335
57565
|
(0, types_1.isInstantiableClass)(setItemMember.classType) ? setItemMember.classType : void 0,
|
|
57336
57566
|
expression,
|
|
57337
|
-
/* recursionCount */
|
|
57338
|
-
void 0,
|
|
57339
57567
|
/* treatConstructorAsClassMember */
|
|
57340
57568
|
false
|
|
57341
57569
|
);
|
|
@@ -57381,10 +57609,10 @@ var require_typeEvaluator = __commonJS({
|
|
|
57381
57609
|
}
|
|
57382
57610
|
if ((0, types_1.isFunction)(declaredType) || (0, types_1.isOverloadedFunction)(declaredType)) {
|
|
57383
57611
|
if (bindFunction) {
|
|
57384
|
-
declaredType =
|
|
57612
|
+
declaredType = bindFunctionToClassOrObjectWithErrors(
|
|
57385
57613
|
classOrObjectBase,
|
|
57386
57614
|
declaredType,
|
|
57387
|
-
/*
|
|
57615
|
+
/* memberAccessClass */
|
|
57388
57616
|
void 0,
|
|
57389
57617
|
expression
|
|
57390
57618
|
);
|
|
@@ -58205,7 +58433,10 @@ var require_typeEvaluator = __commonJS({
|
|
|
58205
58433
|
if ((0, types_1.isTypeVar)(subtype) && !subtype.details.recursiveTypeAliasName) {
|
|
58206
58434
|
if (subtype.details.boundType) {
|
|
58207
58435
|
const boundType = types_1.TypeBase.isInstantiable(subtype) ? (0, typeUtils_1.convertToInstantiable)(subtype.details.boundType) : subtype.details.boundType;
|
|
58208
|
-
|
|
58436
|
+
if (subtype.details.isSynthesizedSelf && (0, types_1.isClass)(boundType)) {
|
|
58437
|
+
return types_1.ClassType.cloneIncludeSubclasses(boundType);
|
|
58438
|
+
}
|
|
58439
|
+
return (0, typeUtils_1.addConditionToType)(boundType, [
|
|
58209
58440
|
{
|
|
58210
58441
|
typeVarName: types_1.TypeVarType.getNameWithScope(subtype),
|
|
58211
58442
|
constraintIndex: 0,
|
|
@@ -58640,13 +58871,11 @@ var require_typeEvaluator = __commonJS({
|
|
|
58640
58871
|
return memberType;
|
|
58641
58872
|
}
|
|
58642
58873
|
if ((0, types_1.isFunction)(memberType) || (0, types_1.isOverloadedFunction)(memberType)) {
|
|
58643
|
-
const methodType =
|
|
58874
|
+
const methodType = bindFunctionToClassOrObjectWithErrors(
|
|
58644
58875
|
bindToClass || objType,
|
|
58645
58876
|
memberType,
|
|
58646
58877
|
classMember && (0, types_1.isInstantiableClass)(classMember.classType) ? classMember.classType : void 0,
|
|
58647
58878
|
errorNode,
|
|
58648
|
-
/* recursionCount */
|
|
58649
|
-
void 0,
|
|
58650
58879
|
/* treatConstructorAsClassMember */
|
|
58651
58880
|
false,
|
|
58652
58881
|
/* firstParamType */
|
|
@@ -59767,13 +59996,11 @@ var require_typeEvaluator = __commonJS({
|
|
|
59767
59996
|
bindToClass = accessMethod.classType;
|
|
59768
59997
|
}
|
|
59769
59998
|
}
|
|
59770
|
-
let boundMethodType =
|
|
59999
|
+
let boundMethodType = bindFunctionToClassOrObjectWithErrors(
|
|
59771
60000
|
lookupClass,
|
|
59772
60001
|
methodType,
|
|
59773
60002
|
bindToClass,
|
|
59774
60003
|
errorNode,
|
|
59775
|
-
/* recursionCount */
|
|
59776
|
-
void 0,
|
|
59777
60004
|
/* treatConstructorAsClassMember */
|
|
59778
60005
|
void 0,
|
|
59779
60006
|
isAccessedThroughMetaclass ? concreteSubtype : void 0
|
|
@@ -59864,16 +60091,10 @@ var require_typeEvaluator = __commonJS({
|
|
|
59864
60091
|
effectiveBindToType = (0, typeUtils_1.convertToInstance)(bindToType);
|
|
59865
60092
|
}
|
|
59866
60093
|
}
|
|
59867
|
-
|
|
59868
|
-
|
|
59869
|
-
|
|
59870
|
-
|
|
59871
|
-
errorNode,
|
|
59872
|
-
/* recursionCount */
|
|
59873
|
-
void 0,
|
|
59874
|
-
treatConstructorAsClassMember,
|
|
59875
|
-
effectiveBindToType
|
|
59876
|
-
);
|
|
60094
|
+
if (effectiveBindToType && (0, types_1.isClass)(effectiveBindToType)) {
|
|
60095
|
+
effectiveBindToType = types_1.ClassType.cloneIncludeSubclasses(effectiveBindToType);
|
|
60096
|
+
}
|
|
60097
|
+
return bindFunctionToClassOrObjectWithErrors(isAccessedThroughObject ? types_1.ClassType.cloneAsInstance(baseTypeClass) : baseTypeClass, concreteSubtype, memberInfo && (0, types_1.isInstantiableClass)(memberInfo.classType) ? memberInfo.classType : void 0, errorNode, treatConstructorAsClassMember, effectiveBindToType);
|
|
59877
60098
|
}
|
|
59878
60099
|
}
|
|
59879
60100
|
if (usage.method === "set") {
|
|
@@ -60053,7 +60274,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
60053
60274
|
});
|
|
60054
60275
|
}
|
|
60055
60276
|
if ((0, types_1.isFunction)(accessMemberType) || (0, types_1.isOverloadedFunction)(accessMemberType)) {
|
|
60056
|
-
const boundMethodType =
|
|
60277
|
+
const boundMethodType = bindFunctionToClassOrObjectWithErrors(classType, accessMemberType, classType, errorNode);
|
|
60057
60278
|
if (boundMethodType && ((0, types_1.isFunction)(boundMethodType) || (0, types_1.isOverloadedFunction)(boundMethodType))) {
|
|
60058
60279
|
const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(boundMethodType));
|
|
60059
60280
|
const callResult = validateCallArguments(
|
|
@@ -60108,7 +60329,13 @@ var require_typeEvaluator = __commonJS({
|
|
|
60108
60329
|
}
|
|
60109
60330
|
}
|
|
60110
60331
|
}
|
|
60111
|
-
const indexTypeResult = getTypeOfIndexWithBaseType(
|
|
60332
|
+
const indexTypeResult = getTypeOfIndexWithBaseType(
|
|
60333
|
+
node,
|
|
60334
|
+
baseTypeResult,
|
|
60335
|
+
{ method: "get" },
|
|
60336
|
+
flags & ~16777216
|
|
60337
|
+
/* DisallowPep695TypeAlias */
|
|
60338
|
+
);
|
|
60112
60339
|
if ((0, codeFlowTypes_1.isCodeFlowSupportedForReference)(node)) {
|
|
60113
60340
|
let baseTypeSupportsIndexNarrowing = !(0, types_1.isAny)(baseTypeResult.type);
|
|
60114
60341
|
mapSubtypesExpandTypeVars(
|
|
@@ -62364,7 +62591,12 @@ var require_typeEvaluator = __commonJS({
|
|
|
62364
62591
|
const remainingArgCount = positionalArgCount - argIndex;
|
|
62365
62592
|
const remainingParamCount = positionParamLimitIndex - paramIndex - 1;
|
|
62366
62593
|
if (paramIndex >= positionParamLimitIndex) {
|
|
62367
|
-
if (
|
|
62594
|
+
if (paramSpecArgList) {
|
|
62595
|
+
while (argIndex < positionalArgCount) {
|
|
62596
|
+
paramSpecArgList.push(argList[argIndex]);
|
|
62597
|
+
argIndex++;
|
|
62598
|
+
}
|
|
62599
|
+
} else {
|
|
62368
62600
|
let tooManyPositionals = false;
|
|
62369
62601
|
if (foundUnpackedListArg && argList[argIndex].argumentCategory === 1) {
|
|
62370
62602
|
const argType = getTypeOfArgument(argList[argIndex]).type;
|
|
@@ -62622,14 +62854,16 @@ var require_typeEvaluator = __commonJS({
|
|
|
62622
62854
|
}
|
|
62623
62855
|
} else if (typeResult.type.details.paramSpec && (0, parameterUtils_1.isParamSpecKwargsArgument)(typeResult.type.details.paramSpec, argType)) {
|
|
62624
62856
|
unpackedDictionaryArgType = types_1.AnyType.create();
|
|
62625
|
-
|
|
62626
|
-
|
|
62627
|
-
|
|
62628
|
-
|
|
62629
|
-
|
|
62630
|
-
|
|
62631
|
-
|
|
62632
|
-
|
|
62857
|
+
if (!paramSpecArgList) {
|
|
62858
|
+
validateArgTypeParams.push({
|
|
62859
|
+
paramCategory: 2,
|
|
62860
|
+
paramType: typeResult.type.details.paramSpec,
|
|
62861
|
+
requiresTypeVarMatching: false,
|
|
62862
|
+
argument: argList[argIndex],
|
|
62863
|
+
argType: (0, types_1.isParamSpec)(argType) ? void 0 : types_1.AnyType.create(),
|
|
62864
|
+
errorNode: argList[argIndex].valueExpression || errorNode
|
|
62865
|
+
});
|
|
62866
|
+
}
|
|
62633
62867
|
} else {
|
|
62634
62868
|
const strObjType = getBuiltInObject(errorNode, "str");
|
|
62635
62869
|
if (mappingType && (0, types_1.isInstantiableClass)(mappingType) && strObjType && (0, types_1.isClassInstance)(strObjType)) {
|
|
@@ -63263,13 +63497,12 @@ var require_typeEvaluator = __commonJS({
|
|
|
63263
63497
|
return { argumentErrors: paramSpecArgResult.argumentErrors, typeVarContexts };
|
|
63264
63498
|
}
|
|
63265
63499
|
function validateFunctionArgumentsForParamSpecSignature(errorNode, argList, paramSpec, typeVarContext, signatureTracker) {
|
|
63266
|
-
|
|
63267
|
-
const paramSpecType = typeVarContext.getParamSpecType(paramSpec);
|
|
63500
|
+
let paramSpecType = typeVarContext.getParamSpecType(paramSpec);
|
|
63268
63501
|
if (!paramSpecType) {
|
|
63269
|
-
|
|
63270
|
-
return { argumentErrors: true, typeVarContexts: [void 0] };
|
|
63502
|
+
paramSpecType = (0, typeUtils_1.convertTypeToParamSpecValue)(paramSpec);
|
|
63271
63503
|
}
|
|
63272
63504
|
const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: paramSpecType }, 0);
|
|
63505
|
+
const functionType = matchResults.overload;
|
|
63273
63506
|
const srcTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeIds)(paramSpecType));
|
|
63274
63507
|
if (matchResults.argumentErrors) {
|
|
63275
63508
|
argList.forEach((arg) => {
|
|
@@ -63279,6 +63512,9 @@ var require_typeEvaluator = __commonJS({
|
|
|
63279
63512
|
});
|
|
63280
63513
|
return { argumentErrors: true, typeVarContexts: [srcTypeVarContext] };
|
|
63281
63514
|
}
|
|
63515
|
+
if (functionType.details.paramSpec && functionType.details.parameters.length === 0 && (0, types_1.isTypeSame)(functionType.details.paramSpec, paramSpec)) {
|
|
63516
|
+
return { argumentErrors: false, typeVarContexts: [srcTypeVarContext] };
|
|
63517
|
+
}
|
|
63282
63518
|
const result = validateFunctionArgumentTypes(errorNode, matchResults, srcTypeVarContext, signatureTracker);
|
|
63283
63519
|
return { argumentErrors: !!result.argumentErrors, typeVarContexts: [srcTypeVarContext] };
|
|
63284
63520
|
}
|
|
@@ -63558,11 +63794,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
63558
63794
|
addError(localize_1.Localizer.Diagnostic.typeVarBoundAndConstrained(), argList[i].valueExpression || errorNode);
|
|
63559
63795
|
} else {
|
|
63560
63796
|
const argType = (_b = (_a = argList[i].typeResult) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : getTypeOfExpressionExpectingType(argList[i].valueExpression).type;
|
|
63561
|
-
if ((0, typeUtils_1.requiresSpecialization)(
|
|
63562
|
-
argType,
|
|
63563
|
-
/* ignorePseudoGeneric */
|
|
63564
|
-
true
|
|
63565
|
-
)) {
|
|
63797
|
+
if ((0, typeUtils_1.requiresSpecialization)(argType, { ignorePseudoGeneric: true, ignoreImplicitTypeArgs: true })) {
|
|
63566
63798
|
addError(localize_1.Localizer.Diagnostic.typeVarBoundGeneric(), argList[i].valueExpression || errorNode);
|
|
63567
63799
|
}
|
|
63568
63800
|
typeVar.details.boundType = (0, typeUtils_1.convertToInstance)(argType);
|
|
@@ -63610,11 +63842,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
63610
63842
|
addError(localize_1.Localizer.Diagnostic.typeVarBoundAndConstrained(), argList[i].valueExpression || errorNode);
|
|
63611
63843
|
} else {
|
|
63612
63844
|
const argType = (_g = (_f = argList[i].typeResult) === null || _f === void 0 ? void 0 : _f.type) !== null && _g !== void 0 ? _g : getTypeOfExpressionExpectingType(argList[i].valueExpression).type;
|
|
63613
|
-
if ((0, typeUtils_1.requiresSpecialization)(
|
|
63614
|
-
argType,
|
|
63615
|
-
/* ignorePseudoGeneric */
|
|
63616
|
-
true
|
|
63617
|
-
)) {
|
|
63845
|
+
if ((0, typeUtils_1.requiresSpecialization)(argType, { ignorePseudoGeneric: true })) {
|
|
63618
63846
|
addError(localize_1.Localizer.Diagnostic.typeVarConstraintGeneric(), argList[i].valueExpression || errorNode);
|
|
63619
63847
|
}
|
|
63620
63848
|
types_1.TypeVarType.addConstraint(typeVar, (0, typeUtils_1.convertToInstance)(argType));
|
|
@@ -65358,13 +65586,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
65358
65586
|
return types_1.UnknownType.create();
|
|
65359
65587
|
}
|
|
65360
65588
|
const type = typeArgs[0].type;
|
|
65361
|
-
if ((0, typeUtils_1.requiresSpecialization)(
|
|
65362
|
-
type,
|
|
65363
|
-
/* ignorePseudoGeneric */
|
|
65364
|
-
true,
|
|
65365
|
-
/* ignoreSelf */
|
|
65366
|
-
true
|
|
65367
|
-
)) {
|
|
65589
|
+
if ((0, typeUtils_1.requiresSpecialization)(type, { ignorePseudoGeneric: true, ignoreSelf: true })) {
|
|
65368
65590
|
const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
|
|
65369
65591
|
addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.classVarWithTypeVar(), (_a = typeArgs[0].node) !== null && _a !== void 0 ? _a : errorNode);
|
|
65370
65592
|
}
|
|
@@ -65480,8 +65702,6 @@ var require_typeEvaluator = __commonJS({
|
|
|
65480
65702
|
isRequired = classType.details.name === "Required";
|
|
65481
65703
|
isNotRequired = classType.details.name === "NotRequired";
|
|
65482
65704
|
}
|
|
65483
|
-
isRequired = classType.details.name === "Required";
|
|
65484
|
-
isNotRequired = classType.details.name === "NotRequired";
|
|
65485
65705
|
if (!isUsageLegal) {
|
|
65486
65706
|
addError(classType.details.name === "ReadOnly" ? localize_1.Localizer.Diagnostic.readOnlyNotInTypedDict() : classType.details.name === "Required" ? localize_1.Localizer.Diagnostic.requiredNotInTypedDict() : localize_1.Localizer.Diagnostic.notRequiredNotInTypedDict(), errorNode);
|
|
65487
65707
|
return { type: types_1.ClassType.cloneForSpecialization(classType, [(0, typeUtils_1.convertToInstance)(typeArgType)], !!typeArgs) };
|
|
@@ -65877,10 +66097,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
65877
66097
|
["LiteralString", { alias: "", module: "builtins" }],
|
|
65878
66098
|
["ReadOnly", { alias: "", module: "builtins" }]
|
|
65879
66099
|
]);
|
|
65880
|
-
|
|
65881
|
-
if (assignedName === "ReadOnly" && !AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
|
|
65882
|
-
aliasMapEntry = void 0;
|
|
65883
|
-
}
|
|
66100
|
+
const aliasMapEntry = specialTypes.get(assignedName);
|
|
65884
66101
|
if (aliasMapEntry) {
|
|
65885
66102
|
const cachedType = readTypeCache(
|
|
65886
66103
|
node,
|
|
@@ -66511,11 +66728,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
66511
66728
|
if (metaclassNode) {
|
|
66512
66729
|
const metaclassType = getTypeOfExpression(metaclassNode, exprFlags).type;
|
|
66513
66730
|
if ((0, types_1.isInstantiableClass)(metaclassType) || (0, types_1.isUnknown)(metaclassType)) {
|
|
66514
|
-
if ((0, typeUtils_1.requiresSpecialization)(
|
|
66515
|
-
metaclassType,
|
|
66516
|
-
/* ignorePseudoGeneric */
|
|
66517
|
-
true
|
|
66518
|
-
)) {
|
|
66731
|
+
if ((0, typeUtils_1.requiresSpecialization)(metaclassType, { ignorePseudoGeneric: true })) {
|
|
66519
66732
|
addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.metaclassIsGeneric(), metaclassNode);
|
|
66520
66733
|
}
|
|
66521
66734
|
classType.details.declaredMetaclass = metaclassType;
|
|
@@ -66788,7 +67001,12 @@ var require_typeEvaluator = __commonJS({
|
|
|
66788
67001
|
false
|
|
66789
67002
|
)) {
|
|
66790
67003
|
if (!reportedMetaclassConflict) {
|
|
66791
|
-
|
|
67004
|
+
const diag = new diagnostic_1.DiagnosticAddendum();
|
|
67005
|
+
diag.addMessage(localize_1.Localizer.DiagnosticAddendum.metaclassConflict().format({
|
|
67006
|
+
metaclass1: printType((0, typeUtils_1.convertToInstance)(effectiveMetaclass)),
|
|
67007
|
+
metaclass2: printType((0, typeUtils_1.convertToInstance)(baseClassMeta))
|
|
67008
|
+
}));
|
|
67009
|
+
addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.metaclassConflict() + diag.getString(), errorNode);
|
|
66792
67010
|
reportedMetaclassConflict = true;
|
|
66793
67011
|
}
|
|
66794
67012
|
}
|
|
@@ -69471,11 +69689,10 @@ var require_typeEvaluator = __commonJS({
|
|
|
69471
69689
|
if (node.boundExpression.nodeType === 52) {
|
|
69472
69690
|
const constraints = node.boundExpression.expressions.map((constraint) => {
|
|
69473
69691
|
const constraintType = getTypeOfExpressionExpectingType(constraint).type;
|
|
69474
|
-
if ((0, typeUtils_1.requiresSpecialization)(
|
|
69475
|
-
|
|
69476
|
-
|
|
69477
|
-
|
|
69478
|
-
)) {
|
|
69692
|
+
if ((0, typeUtils_1.requiresSpecialization)(constraintType, {
|
|
69693
|
+
ignorePseudoGeneric: true,
|
|
69694
|
+
ignoreImplicitTypeArgs: true
|
|
69695
|
+
})) {
|
|
69479
69696
|
addError(localize_1.Localizer.Diagnostic.typeVarBoundGeneric(), constraint);
|
|
69480
69697
|
}
|
|
69481
69698
|
return (0, typeUtils_1.convertToInstance)(constraintType);
|
|
@@ -69487,11 +69704,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
69487
69704
|
}
|
|
69488
69705
|
} else {
|
|
69489
69706
|
const boundType = getTypeOfExpressionExpectingType(node.boundExpression).type;
|
|
69490
|
-
if ((0, typeUtils_1.requiresSpecialization)(
|
|
69491
|
-
boundType,
|
|
69492
|
-
/* ignorePseudoGeneric */
|
|
69493
|
-
true
|
|
69494
|
-
)) {
|
|
69707
|
+
if ((0, typeUtils_1.requiresSpecialization)(boundType, { ignorePseudoGeneric: true })) {
|
|
69495
69708
|
addError(localize_1.Localizer.Diagnostic.typeVarConstraintGeneric(), node.boundExpression);
|
|
69496
69709
|
}
|
|
69497
69710
|
if (node.typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVar) {
|
|
@@ -71566,47 +71779,30 @@ var require_typeEvaluator = __commonJS({
|
|
|
71566
71779
|
}
|
|
71567
71780
|
let specializedSrcType = srcType;
|
|
71568
71781
|
let specializedDestType = destType;
|
|
71569
|
-
let
|
|
71782
|
+
let doSpecializationStep = false;
|
|
71570
71783
|
if ((flags & 2) === 0) {
|
|
71571
71784
|
specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext, { useNarrowBoundOnly: true });
|
|
71572
|
-
|
|
71573
|
-
reverseMatchingFailed = !assignType(
|
|
71574
|
-
specializedSrcType,
|
|
71575
|
-
specializedDestType,
|
|
71576
|
-
/* diag */
|
|
71577
|
-
void 0,
|
|
71578
|
-
srcTypeVarContext,
|
|
71579
|
-
destTypeVarContext,
|
|
71580
|
-
flags ^ 2 | 128,
|
|
71581
|
-
recursionCount
|
|
71582
|
-
);
|
|
71583
|
-
specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext);
|
|
71584
|
-
}
|
|
71785
|
+
doSpecializationStep = (0, typeUtils_1.requiresSpecialization)(specializedDestType);
|
|
71585
71786
|
} else {
|
|
71586
71787
|
specializedSrcType = (0, typeUtils_1.applySolvedTypeVars)(srcType, srcTypeVarContext, { useNarrowBoundOnly: true });
|
|
71587
|
-
|
|
71588
|
-
|
|
71589
|
-
|
|
71590
|
-
|
|
71591
|
-
|
|
71592
|
-
|
|
71593
|
-
|
|
71594
|
-
|
|
71595
|
-
|
|
71596
|
-
|
|
71597
|
-
|
|
71788
|
+
doSpecializationStep = (0, typeUtils_1.requiresSpecialization)(specializedSrcType);
|
|
71789
|
+
}
|
|
71790
|
+
if (doSpecializationStep) {
|
|
71791
|
+
assignType(
|
|
71792
|
+
specializedSrcType,
|
|
71793
|
+
specializedDestType,
|
|
71794
|
+
/* diag */
|
|
71795
|
+
void 0,
|
|
71796
|
+
srcTypeVarContext,
|
|
71797
|
+
destTypeVarContext,
|
|
71798
|
+
flags ^ 2 | 128,
|
|
71799
|
+
recursionCount
|
|
71800
|
+
);
|
|
71801
|
+
if ((flags & 2) === 0) {
|
|
71802
|
+
specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext);
|
|
71803
|
+
} else {
|
|
71598
71804
|
specializedSrcType = (0, typeUtils_1.applySolvedTypeVars)(srcType, srcTypeVarContext);
|
|
71599
71805
|
}
|
|
71600
|
-
if (reverseMatchingFailed) {
|
|
71601
|
-
if (diag && paramIndex !== void 0) {
|
|
71602
|
-
diag.addMessage(localize_1.Localizer.DiagnosticAddendum.paramAssignment().format({
|
|
71603
|
-
index: paramIndex + 1,
|
|
71604
|
-
sourceType: printType(destType),
|
|
71605
|
-
destType: printType(srcType)
|
|
71606
|
-
}));
|
|
71607
|
-
}
|
|
71608
|
-
return false;
|
|
71609
|
-
}
|
|
71610
71806
|
}
|
|
71611
71807
|
if (!(0, types_1.isTypeVar)(specializedDestType) || !specializedDestType.details.isSynthesizedSelf) {
|
|
71612
71808
|
if ((0, types_1.isTypeVar)(specializedSrcType) && specializedSrcType.details.isSynthesizedSelf && specializedSrcType.details.boundType) {
|
|
@@ -72068,10 +72264,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
72068
72264
|
return void 0;
|
|
72069
72265
|
}
|
|
72070
72266
|
recursionCount++;
|
|
72071
|
-
if (assignedType.tupleTypeArguments) {
|
|
72072
|
-
return void 0;
|
|
72073
|
-
}
|
|
72074
|
-
if (assignedType.details.typeParameters.length > 0 && assignedType.typeArguments && assignedType.typeArguments.length <= assignedType.details.typeParameters.length) {
|
|
72267
|
+
if (assignedType.details.typeParameters.length > 0 && assignedType.typeArguments && assignedType.typeArguments.length <= assignedType.details.typeParameters.length && !assignedType.tupleTypeArguments) {
|
|
72075
72268
|
const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(assignedType));
|
|
72076
72269
|
(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, types_1.ClassType.cloneForSpecialization(
|
|
72077
72270
|
assignedType,
|
|
@@ -72628,7 +72821,15 @@ var require_typeEvaluator = __commonJS({
|
|
|
72628
72821
|
});
|
|
72629
72822
|
return methodList;
|
|
72630
72823
|
}
|
|
72631
|
-
function
|
|
72824
|
+
function bindFunctionToClassOrObjectWithErrors(baseType, memberType, memberClass, errorNode, treatConstructorAsClassMember = false, firstParamType) {
|
|
72825
|
+
const diag = errorNode ? new diagnostic_1.DiagnosticAddendum() : void 0;
|
|
72826
|
+
const result = bindFunctionToClassOrObject(baseType, memberType, memberClass, treatConstructorAsClassMember, firstParamType, diag);
|
|
72827
|
+
if (!result && errorNode && diag) {
|
|
72828
|
+
addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, diag.getString(), errorNode);
|
|
72829
|
+
}
|
|
72830
|
+
return result;
|
|
72831
|
+
}
|
|
72832
|
+
function bindFunctionToClassOrObject(baseType, memberType, memberClass, treatConstructorAsClassMember = false, firstParamType, diag, recursionCount = 0) {
|
|
72632
72833
|
if ((0, types_1.isFunction)(memberType)) {
|
|
72633
72834
|
if (!baseType) {
|
|
72634
72835
|
return types_1.FunctionType.clone(
|
|
@@ -72646,7 +72847,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
72646
72847
|
baseType,
|
|
72647
72848
|
memberType,
|
|
72648
72849
|
memberClass || types_1.ClassType.cloneAsInstantiable(baseObj),
|
|
72649
|
-
|
|
72850
|
+
diag,
|
|
72650
72851
|
recursionCount,
|
|
72651
72852
|
firstParamType || baseObj,
|
|
72652
72853
|
/* stripFirstParam */
|
|
@@ -72660,7 +72861,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
72660
72861
|
types_1.TypeBase.isInstance(baseType) ? types_1.ClassType.cloneAsInstantiable(baseType) : baseType,
|
|
72661
72862
|
memberType,
|
|
72662
72863
|
memberClass || baseClass,
|
|
72663
|
-
|
|
72864
|
+
diag,
|
|
72664
72865
|
recursionCount,
|
|
72665
72866
|
effectiveFirstParamType,
|
|
72666
72867
|
/* stripFirstParam */
|
|
@@ -72673,7 +72874,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
72673
72874
|
types_1.TypeBase.isInstance(baseType) ? types_1.ClassType.cloneAsInstantiable(baseType) : baseType,
|
|
72674
72875
|
memberType,
|
|
72675
72876
|
memberClass || baseClass,
|
|
72676
|
-
|
|
72877
|
+
diag,
|
|
72677
72878
|
recursionCount,
|
|
72678
72879
|
/* effectiveFirstParamType */
|
|
72679
72880
|
void 0,
|
|
@@ -72688,37 +72889,38 @@ var require_typeEvaluator = __commonJS({
|
|
|
72688
72889
|
baseType,
|
|
72689
72890
|
overload,
|
|
72690
72891
|
memberClass,
|
|
72691
|
-
/* errorNode */
|
|
72692
|
-
void 0,
|
|
72693
|
-
recursionCount,
|
|
72694
72892
|
treatConstructorAsClassMember,
|
|
72695
|
-
firstParamType
|
|
72893
|
+
firstParamType,
|
|
72894
|
+
/* diag */
|
|
72895
|
+
void 0,
|
|
72896
|
+
recursionCount
|
|
72696
72897
|
);
|
|
72697
72898
|
if (boundMethod) {
|
|
72698
72899
|
types_1.OverloadedFunctionType.addOverload(newOverloadType, boundMethod);
|
|
72699
72900
|
}
|
|
72700
72901
|
});
|
|
72701
|
-
|
|
72702
|
-
|
|
72902
|
+
const newOverloads = types_1.OverloadedFunctionType.getOverloads(newOverloadType);
|
|
72903
|
+
if (newOverloads.length === 0) {
|
|
72904
|
+
if (diag) {
|
|
72703
72905
|
memberType.overloads.forEach((overload) => {
|
|
72704
|
-
bindFunctionToClassOrObject(baseType, overload, memberClass,
|
|
72906
|
+
bindFunctionToClassOrObject(baseType, overload, memberClass, treatConstructorAsClassMember, firstParamType, diag, recursionCount);
|
|
72705
72907
|
});
|
|
72706
72908
|
}
|
|
72707
72909
|
return void 0;
|
|
72708
|
-
}
|
|
72709
|
-
|
|
72910
|
+
}
|
|
72911
|
+
if (newOverloads.length === 1) {
|
|
72912
|
+
return newOverloads[0];
|
|
72710
72913
|
}
|
|
72711
72914
|
return newOverloadType;
|
|
72712
72915
|
}
|
|
72713
72916
|
return memberType;
|
|
72714
72917
|
}
|
|
72715
|
-
function partiallySpecializeFunctionForBoundClassOrObject(baseType, memberType, memberClass,
|
|
72918
|
+
function partiallySpecializeFunctionForBoundClassOrObject(baseType, memberType, memberClass, diag, recursionCount, firstParamType, stripFirstParam = true) {
|
|
72716
72919
|
const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(memberClass));
|
|
72717
72920
|
if (firstParamType && memberType.details.parameters.length > 0) {
|
|
72718
72921
|
const memberTypeFirstParam = memberType.details.parameters[0];
|
|
72719
72922
|
const memberTypeFirstParamType = types_1.FunctionType.getEffectiveParameterType(memberType, 0);
|
|
72720
72923
|
typeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(memberType));
|
|
72721
|
-
const diag = errorNode ? new diagnostic_1.DiagnosticAddendum() : void 0;
|
|
72722
72924
|
if ((0, types_1.isTypeVar)(memberTypeFirstParamType) && memberTypeFirstParamType.details.boundType && (0, types_1.isClassInstance)(memberTypeFirstParamType.details.boundType) && types_1.ClassType.isProtocolClass(memberTypeFirstParamType.details.boundType)) {
|
|
72723
72925
|
if (!typeVarContext.isLocked()) {
|
|
72724
72926
|
typeVarContext.setTypeVarType(memberTypeFirstParamType, types_1.TypeBase.isInstantiable(memberTypeFirstParamType) ? (0, typeUtils_1.convertToInstance)(firstParamType) : firstParamType);
|
|
@@ -72726,7 +72928,7 @@ var require_typeEvaluator = __commonJS({
|
|
|
72726
72928
|
} else if (!assignType(
|
|
72727
72929
|
memberTypeFirstParamType,
|
|
72728
72930
|
firstParamType,
|
|
72729
|
-
diag,
|
|
72931
|
+
diag === null || diag === void 0 ? void 0 : diag.createAddendum(),
|
|
72730
72932
|
typeVarContext,
|
|
72731
72933
|
/* srcTypeVarContext */
|
|
72732
72934
|
void 0,
|
|
@@ -72734,16 +72936,14 @@ var require_typeEvaluator = __commonJS({
|
|
|
72734
72936
|
recursionCount
|
|
72735
72937
|
)) {
|
|
72736
72938
|
if (memberTypeFirstParam.name && !memberTypeFirstParam.isNameSynthesized && memberTypeFirstParam.hasDeclaredType) {
|
|
72737
|
-
if (
|
|
72738
|
-
|
|
72739
|
-
addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.bindTypeMismatch().format({
|
|
72939
|
+
if (diag) {
|
|
72940
|
+
diag.addMessage(localize_1.Localizer.Diagnostic.bindTypeMismatch().format({
|
|
72740
72941
|
type: printType(baseType),
|
|
72741
|
-
methodName,
|
|
72942
|
+
methodName: memberType.details.name || "<anonymous>",
|
|
72742
72943
|
paramName: memberTypeFirstParam.name
|
|
72743
|
-
})
|
|
72744
|
-
} else {
|
|
72745
|
-
return void 0;
|
|
72944
|
+
}));
|
|
72746
72945
|
}
|
|
72946
|
+
return void 0;
|
|
72747
72947
|
}
|
|
72748
72948
|
}
|
|
72749
72949
|
}
|
|
@@ -75506,7 +75706,7 @@ var require_pyrightFileSystem = __commonJS({
|
|
|
75506
75706
|
"node_modules/@zzzen/pyright-internal/dist/pyrightFileSystem.js"(exports) {
|
|
75507
75707
|
"use strict";
|
|
75508
75708
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
75509
|
-
exports.PyrightFileSystem = exports.
|
|
75709
|
+
exports.PyrightFileSystem = exports.SupportPartialStubs = void 0;
|
|
75510
75710
|
var pyTypedUtils_1 = require_pyTypedUtils();
|
|
75511
75711
|
var pathConsts_1 = require_pathConsts();
|
|
75512
75712
|
var pathUtils_1 = require_pathUtils();
|
|
@@ -75518,19 +75718,11 @@ var require_pyrightFileSystem = __commonJS({
|
|
|
75518
75718
|
}
|
|
75519
75719
|
SupportPartialStubs2.is = is;
|
|
75520
75720
|
})(SupportPartialStubs = exports.SupportPartialStubs || (exports.SupportPartialStubs = {}));
|
|
75521
|
-
var SupportUriToPathMapping;
|
|
75522
|
-
(function(SupportUriToPathMapping2) {
|
|
75523
|
-
function is(value) {
|
|
75524
|
-
return value.hasUriMapEntry && value.addUriMap && value.removeUriMap && value.pendingRequest;
|
|
75525
|
-
}
|
|
75526
|
-
SupportUriToPathMapping2.is = is;
|
|
75527
|
-
})(SupportUriToPathMapping = exports.SupportUriToPathMapping || (exports.SupportUriToPathMapping = {}));
|
|
75528
75721
|
var PyrightFileSystem = class extends readonlyAugmentedFileSystem_1.ReadOnlyAugmentedFileSystem {
|
|
75529
75722
|
constructor(realFS) {
|
|
75530
75723
|
super(realFS);
|
|
75531
75724
|
this._rootSearched = /* @__PURE__ */ new Set();
|
|
75532
75725
|
this._partialStubPackagePaths = /* @__PURE__ */ new Set();
|
|
75533
|
-
this._customUriMap = /* @__PURE__ */ new Map();
|
|
75534
75726
|
}
|
|
75535
75727
|
mkdirSync(path13, options) {
|
|
75536
75728
|
this.realFS.mkdirSync(path13, options);
|
|
@@ -75554,54 +75746,8 @@ var require_pyrightFileSystem = __commonJS({
|
|
|
75554
75746
|
this.realFS.copyFileSync(this.getOriginalPath(src), this.getOriginalPath(dst));
|
|
75555
75747
|
}
|
|
75556
75748
|
getUri(originalPath) {
|
|
75557
|
-
const entry = this._customUriMap.get(this.getMappedFilePath(originalPath));
|
|
75558
|
-
if (entry) {
|
|
75559
|
-
return entry.uri;
|
|
75560
|
-
}
|
|
75561
75749
|
return this.realFS.getUri(originalPath);
|
|
75562
75750
|
}
|
|
75563
|
-
hasUriMapEntry(uriString, mappedPath) {
|
|
75564
|
-
const entry = this._customUriMap.get(mappedPath);
|
|
75565
|
-
if (!entry || entry.uri !== uriString) {
|
|
75566
|
-
return false;
|
|
75567
|
-
}
|
|
75568
|
-
return true;
|
|
75569
|
-
}
|
|
75570
|
-
addUriMap(uriString, mappedPath) {
|
|
75571
|
-
const entry = this._customUriMap.get(mappedPath);
|
|
75572
|
-
if (!entry) {
|
|
75573
|
-
this._customUriMap.set(mappedPath, { uri: uriString, closed: false, hasPendingRequest: false });
|
|
75574
|
-
return true;
|
|
75575
|
-
}
|
|
75576
|
-
if (entry.uri !== uriString) {
|
|
75577
|
-
return false;
|
|
75578
|
-
}
|
|
75579
|
-
entry.closed = false;
|
|
75580
|
-
return true;
|
|
75581
|
-
}
|
|
75582
|
-
removeUriMap(uriString, mappedPath) {
|
|
75583
|
-
const entry = this._customUriMap.get(mappedPath);
|
|
75584
|
-
if (!entry || entry.uri !== uriString) {
|
|
75585
|
-
return false;
|
|
75586
|
-
}
|
|
75587
|
-
if (entry.hasPendingRequest) {
|
|
75588
|
-
entry.closed = true;
|
|
75589
|
-
return true;
|
|
75590
|
-
}
|
|
75591
|
-
this._customUriMap.delete(mappedPath);
|
|
75592
|
-
return true;
|
|
75593
|
-
}
|
|
75594
|
-
pendingRequest(mappedPath, hasPendingRequest) {
|
|
75595
|
-
const entry = this._customUriMap.get(mappedPath);
|
|
75596
|
-
if (!entry) {
|
|
75597
|
-
return;
|
|
75598
|
-
}
|
|
75599
|
-
if (!hasPendingRequest && entry.closed) {
|
|
75600
|
-
this._customUriMap.delete(mappedPath);
|
|
75601
|
-
return;
|
|
75602
|
-
}
|
|
75603
|
-
entry.hasPendingRequest = hasPendingRequest;
|
|
75604
|
-
}
|
|
75605
75751
|
isPartialStubPackagesScanned(execEnv) {
|
|
75606
75752
|
var _a;
|
|
75607
75753
|
return this.isPathScanned((_a = execEnv.root) !== null && _a !== void 0 ? _a : "");
|
|
@@ -75839,7 +75985,6 @@ var require_serviceProviderExtensions = __commonJS({
|
|
|
75839
75985
|
ServiceKeys2.console = new serviceProvider_1.ServiceKey();
|
|
75840
75986
|
ServiceKeys2.sourceFileFactory = new serviceProvider_1.ServiceKey();
|
|
75841
75987
|
ServiceKeys2.partialStubs = new serviceProvider_1.ServiceKey();
|
|
75842
|
-
ServiceKeys2.uriMapper = new serviceProvider_1.ServiceKey();
|
|
75843
75988
|
ServiceKeys2.symbolDefinitionProvider = new serviceProvider_1.GroupServiceKey();
|
|
75844
75989
|
ServiceKeys2.symbolUsageProviderFactory = new serviceProvider_1.GroupServiceKey();
|
|
75845
75990
|
ServiceKeys2.stateMutationListeners = new serviceProvider_1.GroupServiceKey();
|
|
@@ -75860,9 +76005,6 @@ var require_serviceProviderExtensions = __commonJS({
|
|
|
75860
76005
|
if (pyrightFileSystem_1.SupportPartialStubs.is(service)) {
|
|
75861
76006
|
sp.add(ServiceKeys.partialStubs, service);
|
|
75862
76007
|
}
|
|
75863
|
-
if (pyrightFileSystem_1.SupportUriToPathMapping.is(service)) {
|
|
75864
|
-
sp.add(ServiceKeys.uriMapper, service);
|
|
75865
|
-
}
|
|
75866
76008
|
if (fileSystem_1.TempFile.is(service)) {
|
|
75867
76009
|
sp.add(ServiceKeys.tempFile, service);
|
|
75868
76010
|
}
|
|
@@ -75876,9 +76018,6 @@ var require_serviceProviderExtensions = __commonJS({
|
|
|
75876
76018
|
serviceProvider_1.ServiceProvider.prototype.console = function() {
|
|
75877
76019
|
return this.get(ServiceKeys.console);
|
|
75878
76020
|
};
|
|
75879
|
-
serviceProvider_1.ServiceProvider.prototype.uriMapper = function() {
|
|
75880
|
-
return this.get(ServiceKeys.uriMapper);
|
|
75881
|
-
};
|
|
75882
76021
|
serviceProvider_1.ServiceProvider.prototype.partialStubs = function() {
|
|
75883
76022
|
return this.get(ServiceKeys.partialStubs);
|
|
75884
76023
|
};
|
|
@@ -75927,8 +76066,8 @@ var require_pathUtils = __commonJS({
|
|
|
75927
76066
|
return result;
|
|
75928
76067
|
};
|
|
75929
76068
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
75930
|
-
exports.
|
|
75931
|
-
exports.deduplicateFolders = exports.getDirectoryChangeKind = exports.getLibraryPathWithoutExtension = void 0;
|
|
76069
|
+
exports.setTestingMode = exports.convertPathToUri = exports.extractPathFromUri = exports.convertUriToPath = exports.isDiskPathRoot = exports.isRootedDiskPath = exports.getRegexEscapedSeparator = exports.getFileSpec = exports.hasPythonExtension = exports.getWildcardRoot = exports.isDirectoryWildcardPatternPresent = exports.getWildcardRegexPattern = exports.getFileSystemEntriesFromDirEntries = exports.getFileSystemEntries = exports.tryRealpath = exports.tryStat = exports.isFile = exports.isDirectory = exports.normalizePath = exports.realCasePath = exports.stripFileExtension = exports.getShortenedFileName = exports.getFileName = exports.getFileExtension = exports.stripTrailingDirectorySeparator = exports.hasTrailingDirectorySeparator = exports.ensureTrailingDirectorySeparator = exports.getRelativePathComponentsFromDirectory = exports.getRelativePathFromDirectory = exports.getBaseFileName = exports.getAnyExtensionFromPath = exports.changeAnyExtension = exports.containsPath = exports.combinePaths = exports.resolvePaths = exports.normalizeSlashes = exports.directoryExists = exports.fileExists = exports.getFileSize = exports.makeDirectories = exports.getRelativePath = exports.combinePathComponents = exports.reducePathComponents = exports.getPathComponents = exports.getPathSeparator = exports.getRootLength = exports.isUri = exports.getDirectoryPath = exports.forEachAncestorDirectory = exports.FileSpec = void 0;
|
|
76070
|
+
exports.deduplicateFolders = exports.getDirectoryChangeKind = exports.getLibraryPathWithoutExtension = exports.isFileSystemCaseSensitiveInternal = exports.isFileSystemCaseSensitive = void 0;
|
|
75932
76071
|
var path13 = __importStar(require("path"));
|
|
75933
76072
|
var vscode_uri_1 = (init_esm(), __toCommonJS(esm_exports));
|
|
75934
76073
|
var collectionUtils_1 = require_collectionUtils();
|
|
@@ -75980,9 +76119,16 @@ var require_pathUtils = __commonJS({
|
|
|
75980
76119
|
}
|
|
75981
76120
|
exports.forEachAncestorDirectory = forEachAncestorDirectory;
|
|
75982
76121
|
function getDirectoryPath(pathString) {
|
|
76122
|
+
if (isUri(pathString)) {
|
|
76123
|
+
return vscode_uri_1.Utils.dirname(vscode_uri_1.URI.parse(pathString).with({ fragment: "" })).toString();
|
|
76124
|
+
}
|
|
75983
76125
|
return pathString.substr(0, Math.max(getRootLength(pathString), pathString.lastIndexOf(path13.sep)));
|
|
75984
76126
|
}
|
|
75985
76127
|
exports.getDirectoryPath = getDirectoryPath;
|
|
76128
|
+
function isUri(pathString) {
|
|
76129
|
+
return pathString.indexOf(":") > 1;
|
|
76130
|
+
}
|
|
76131
|
+
exports.isUri = isUri;
|
|
75986
76132
|
function getRootLength(pathString) {
|
|
75987
76133
|
if (pathString.charAt(0) === path13.sep) {
|
|
75988
76134
|
if (pathString.charAt(1) !== path13.sep) {
|
|
@@ -76002,14 +76148,22 @@ var require_pathUtils = __commonJS({
|
|
|
76002
76148
|
return 2;
|
|
76003
76149
|
}
|
|
76004
76150
|
}
|
|
76151
|
+
if (isUri(pathString)) {
|
|
76152
|
+
return vscode_uri_1.URI.parse(pathString).scheme.length + 3;
|
|
76153
|
+
}
|
|
76005
76154
|
return 0;
|
|
76006
76155
|
}
|
|
76007
76156
|
exports.getRootLength = getRootLength;
|
|
76157
|
+
function getPathSeparator(pathString) {
|
|
76158
|
+
return isUri(pathString) ? "/" : path13.sep;
|
|
76159
|
+
}
|
|
76160
|
+
exports.getPathSeparator = getPathSeparator;
|
|
76008
76161
|
function getPathComponents(pathString) {
|
|
76009
76162
|
const normalizedPath = normalizeSlashes(pathString);
|
|
76010
76163
|
const rootLength = getRootLength(normalizedPath);
|
|
76011
76164
|
const root = normalizedPath.substring(0, rootLength);
|
|
76012
|
-
const
|
|
76165
|
+
const sep = getPathSeparator(pathString);
|
|
76166
|
+
const rest = normalizedPath.substring(rootLength).split(sep);
|
|
76013
76167
|
if (rest.length > 0 && !rest[rest.length - 1]) {
|
|
76014
76168
|
rest.pop();
|
|
76015
76169
|
}
|
|
@@ -76046,7 +76200,8 @@ var require_pathUtils = __commonJS({
|
|
|
76046
76200
|
return "";
|
|
76047
76201
|
}
|
|
76048
76202
|
const root = components[0] && ensureTrailingDirectorySeparator(components[0]);
|
|
76049
|
-
|
|
76203
|
+
const sep = getPathSeparator(root);
|
|
76204
|
+
return normalizeSlashes(root + components.slice(1).join(sep));
|
|
76050
76205
|
}
|
|
76051
76206
|
exports.combinePathComponents = combinePathComponents;
|
|
76052
76207
|
function getRelativePath(dirPath, relativeTo) {
|
|
@@ -76055,9 +76210,10 @@ var require_pathUtils = __commonJS({
|
|
|
76055
76210
|
}
|
|
76056
76211
|
const pathComponents = getPathComponents(dirPath);
|
|
76057
76212
|
const relativeToComponents = getPathComponents(relativeTo);
|
|
76213
|
+
const sep = getPathSeparator(dirPath);
|
|
76058
76214
|
let relativePath = ".";
|
|
76059
76215
|
for (let i = relativeToComponents.length; i < pathComponents.length; i++) {
|
|
76060
|
-
relativePath +=
|
|
76216
|
+
relativePath += sep + pathComponents[i];
|
|
76061
76217
|
}
|
|
76062
76218
|
return relativePath;
|
|
76063
76219
|
}
|
|
@@ -76105,9 +76261,11 @@ var require_pathUtils = __commonJS({
|
|
|
76105
76261
|
exports.directoryExists = directoryExists;
|
|
76106
76262
|
var getInvalidSeparator = (sep) => sep === "/" ? "\\" : "/";
|
|
76107
76263
|
function normalizeSlashes(pathString, sep = path13.sep) {
|
|
76108
|
-
if (pathString
|
|
76109
|
-
|
|
76110
|
-
|
|
76264
|
+
if (!isUri(pathString)) {
|
|
76265
|
+
if (pathString.includes(getInvalidSeparator(sep))) {
|
|
76266
|
+
const separatorRegExp = /[\\/]/g;
|
|
76267
|
+
return pathString.replace(separatorRegExp, sep);
|
|
76268
|
+
}
|
|
76111
76269
|
}
|
|
76112
76270
|
return pathString;
|
|
76113
76271
|
}
|
|
@@ -76116,7 +76274,7 @@ var require_pathUtils = __commonJS({
|
|
|
76116
76274
|
return normalizePath((0, collectionUtils_1.some)(paths) ? combinePaths(path14, ...paths) : normalizeSlashes(path14));
|
|
76117
76275
|
}
|
|
76118
76276
|
exports.resolvePaths = resolvePaths;
|
|
76119
|
-
function
|
|
76277
|
+
function combineFilePaths(pathString, ...paths) {
|
|
76120
76278
|
if (pathString) {
|
|
76121
76279
|
pathString = normalizeSlashes(pathString);
|
|
76122
76280
|
}
|
|
@@ -76133,6 +76291,20 @@ var require_pathUtils = __commonJS({
|
|
|
76133
76291
|
}
|
|
76134
76292
|
return pathString;
|
|
76135
76293
|
}
|
|
76294
|
+
function combinePaths(pathString, ...paths) {
|
|
76295
|
+
if (!isUri(pathString)) {
|
|
76296
|
+
return combineFilePaths(pathString, ...paths);
|
|
76297
|
+
}
|
|
76298
|
+
if ((0, collectionUtils_1.some)(paths, (p) => !!p && getRootLength(p) !== 0)) {
|
|
76299
|
+
return combineFilePaths(pathString, ...paths);
|
|
76300
|
+
}
|
|
76301
|
+
const nonEmptyPaths = paths.filter((p) => !!p);
|
|
76302
|
+
const uri = vscode_uri_1.URI.parse(pathString);
|
|
76303
|
+
if (uri.path === "" || uri.path === void 0) {
|
|
76304
|
+
nonEmptyPaths.unshift("/");
|
|
76305
|
+
}
|
|
76306
|
+
return vscode_uri_1.Utils.joinPath(uri.with({ fragment: "" }), ...nonEmptyPaths).toString();
|
|
76307
|
+
}
|
|
76136
76308
|
exports.combinePaths = combinePaths;
|
|
76137
76309
|
function containsPath(parent, child, currentDirectory, ignoreCase) {
|
|
76138
76310
|
if (typeof currentDirectory === "string") {
|
|
@@ -76186,7 +76358,7 @@ var require_pathUtils = __commonJS({
|
|
|
76186
76358
|
return "";
|
|
76187
76359
|
}
|
|
76188
76360
|
pathString = stripTrailingDirectorySeparator(pathString);
|
|
76189
|
-
const name = pathString.slice(Math.max(getRootLength(pathString), pathString.lastIndexOf(path13.sep) + 1));
|
|
76361
|
+
const name = isUri(pathString) ? vscode_uri_1.Utils.basename(vscode_uri_1.URI.parse(pathString)) : pathString.slice(Math.max(getRootLength(pathString), pathString.lastIndexOf(path13.sep) + 1));
|
|
76190
76362
|
const extension = extensions2 !== void 0 && ignoreCase !== void 0 ? getAnyExtensionFromPath(name, extensions2, ignoreCase) : void 0;
|
|
76191
76363
|
return extension ? name.slice(0, name.length - extension.length) : name;
|
|
76192
76364
|
}
|
|
@@ -76205,8 +76377,9 @@ var require_pathUtils = __commonJS({
|
|
|
76205
76377
|
}
|
|
76206
76378
|
exports.getRelativePathComponentsFromDirectory = getRelativePathComponentsFromDirectory;
|
|
76207
76379
|
function ensureTrailingDirectorySeparator(pathString) {
|
|
76380
|
+
const sep = getPathSeparator(pathString);
|
|
76208
76381
|
if (!hasTrailingDirectorySeparator(pathString)) {
|
|
76209
|
-
return pathString +
|
|
76382
|
+
return pathString + sep;
|
|
76210
76383
|
}
|
|
76211
76384
|
return pathString;
|
|
76212
76385
|
}
|
|
@@ -76254,11 +76427,14 @@ var require_pathUtils = __commonJS({
|
|
|
76254
76427
|
}
|
|
76255
76428
|
exports.stripFileExtension = stripFileExtension;
|
|
76256
76429
|
function realCasePath(pathString, fileSystem) {
|
|
76257
|
-
return fileSystem.realCasePath(pathString);
|
|
76430
|
+
return isUri(pathString) ? pathString : fileSystem.realCasePath(pathString);
|
|
76258
76431
|
}
|
|
76259
76432
|
exports.realCasePath = realCasePath;
|
|
76260
76433
|
function normalizePath(pathString) {
|
|
76261
|
-
|
|
76434
|
+
if (!isUri(pathString)) {
|
|
76435
|
+
return normalizeSlashes(path13.normalize(pathString));
|
|
76436
|
+
}
|
|
76437
|
+
return pathString;
|
|
76262
76438
|
}
|
|
76263
76439
|
exports.normalizePath = normalizePath;
|
|
76264
76440
|
function isDirectory(fs8, path14) {
|
|
@@ -76344,7 +76520,7 @@ var require_pathUtils = __commonJS({
|
|
|
76344
76520
|
absolutePath = ensureTrailingDirectorySeparator(absolutePath);
|
|
76345
76521
|
}
|
|
76346
76522
|
const pathComponents = getPathComponents(absolutePath);
|
|
76347
|
-
const escapedSeparator = getRegexEscapedSeparator();
|
|
76523
|
+
const escapedSeparator = getRegexEscapedSeparator(getPathSeparator(rootPath));
|
|
76348
76524
|
const doubleAsteriskRegexFragment = `(${escapedSeparator}[^${escapedSeparator}][^${escapedSeparator}]*)*?`;
|
|
76349
76525
|
const reservedCharacterPattern = new RegExp(`[^\\w\\s${escapedSeparator}]`, "g");
|
|
76350
76526
|
if (pathComponents.length > 0) {
|
|
@@ -76394,11 +76570,12 @@ var require_pathUtils = __commonJS({
|
|
|
76394
76570
|
absolutePath = ensureTrailingDirectorySeparator(absolutePath);
|
|
76395
76571
|
}
|
|
76396
76572
|
const pathComponents = getPathComponents(absolutePath);
|
|
76573
|
+
const sep = getPathSeparator(absolutePath);
|
|
76397
76574
|
if (pathComponents.length > 0) {
|
|
76398
76575
|
pathComponents[0] = stripTrailingDirectorySeparator(pathComponents[0]);
|
|
76399
76576
|
}
|
|
76400
76577
|
if (pathComponents.length === 1 && !pathComponents[0]) {
|
|
76401
|
-
return
|
|
76578
|
+
return sep;
|
|
76402
76579
|
}
|
|
76403
76580
|
let wildcardRoot = "";
|
|
76404
76581
|
let firstComponent = true;
|
|
@@ -76410,7 +76587,7 @@ var require_pathUtils = __commonJS({
|
|
|
76410
76587
|
break;
|
|
76411
76588
|
}
|
|
76412
76589
|
if (!firstComponent) {
|
|
76413
|
-
component =
|
|
76590
|
+
component = sep + component;
|
|
76414
76591
|
}
|
|
76415
76592
|
wildcardRoot += component;
|
|
76416
76593
|
firstComponent = false;
|
|
@@ -76425,7 +76602,7 @@ var require_pathUtils = __commonJS({
|
|
|
76425
76602
|
exports.hasPythonExtension = hasPythonExtension;
|
|
76426
76603
|
function getFileSpec(sp, rootPath, fileSpec) {
|
|
76427
76604
|
let regExPattern = getWildcardRegexPattern(rootPath, fileSpec);
|
|
76428
|
-
const escapedSeparator = getRegexEscapedSeparator();
|
|
76605
|
+
const escapedSeparator = getRegexEscapedSeparator(getPathSeparator(rootPath));
|
|
76429
76606
|
regExPattern = `^(${regExPattern})($|${escapedSeparator})`;
|
|
76430
76607
|
const fs8 = sp.get(serviceProviderExtensions_1.ServiceKeys.fs);
|
|
76431
76608
|
const tmp = sp.tryGet(serviceProviderExtensions_1.ServiceKeys.tempFile);
|
|
@@ -76439,8 +76616,8 @@ var require_pathUtils = __commonJS({
|
|
|
76439
76616
|
};
|
|
76440
76617
|
}
|
|
76441
76618
|
exports.getFileSpec = getFileSpec;
|
|
76442
|
-
function getRegexEscapedSeparator() {
|
|
76443
|
-
return
|
|
76619
|
+
function getRegexEscapedSeparator(pathSep = path13.sep) {
|
|
76620
|
+
return pathSep === "/" ? "/" : "\\\\";
|
|
76444
76621
|
}
|
|
76445
76622
|
exports.getRegexEscapedSeparator = getRegexEscapedSeparator;
|
|
76446
76623
|
function isRootedDiskPath(path14) {
|
|
@@ -76524,11 +76701,14 @@ var require_pathUtils = __commonJS({
|
|
|
76524
76701
|
exports.convertUriToPath = convertUriToPath;
|
|
76525
76702
|
function extractPathFromUri(uriString) {
|
|
76526
76703
|
const uri = vscode_uri_1.URI.parse(uriString);
|
|
76527
|
-
|
|
76528
|
-
|
|
76529
|
-
|
|
76704
|
+
if (uri.scheme === "file" && !uri.fragment) {
|
|
76705
|
+
let convertedPath = normalizePath(uri.fsPath);
|
|
76706
|
+
if (convertedPath.match(/^\\[a-zA-Z]:\\/)) {
|
|
76707
|
+
convertedPath = convertedPath.slice(1);
|
|
76708
|
+
}
|
|
76709
|
+
return convertedPath;
|
|
76530
76710
|
}
|
|
76531
|
-
return
|
|
76711
|
+
return uriString;
|
|
76532
76712
|
}
|
|
76533
76713
|
exports.extractPathFromUri = extractPathFromUri;
|
|
76534
76714
|
function convertPathToUri(fs8, path14) {
|
|
@@ -86477,11 +86657,7 @@ var require_checker = __commonJS({
|
|
|
86477
86657
|
}
|
|
86478
86658
|
break;
|
|
86479
86659
|
case 3:
|
|
86480
|
-
|
|
86481
|
-
isSupported = false;
|
|
86482
|
-
} else {
|
|
86483
|
-
isSupported = types_1.TypeBase.isInstantiable(subtype);
|
|
86484
|
-
}
|
|
86660
|
+
isSupported = types_1.TypeBase.isInstantiable(subtype);
|
|
86485
86661
|
break;
|
|
86486
86662
|
case 5:
|
|
86487
86663
|
if (!types_1.TypeBase.isInstantiable(subtype) || subtype.isCallableWithTypeArgs) {
|
|
@@ -87342,10 +87518,6 @@ var require_checker = __commonJS({
|
|
|
87342
87518
|
newMemberType,
|
|
87343
87519
|
/* memberClass */
|
|
87344
87520
|
void 0,
|
|
87345
|
-
/* errorNode */
|
|
87346
|
-
void 0,
|
|
87347
|
-
/* recursionCount */
|
|
87348
|
-
void 0,
|
|
87349
87521
|
/* treatConstructorAsClassMember */
|
|
87350
87522
|
true
|
|
87351
87523
|
);
|
|
@@ -87742,7 +87914,7 @@ var require_checker = __commonJS({
|
|
|
87742
87914
|
if ((0, types_1.isFunction)(overrideType) || (0, types_1.isOverloadedFunction)(overrideType)) {
|
|
87743
87915
|
const exemptMethods = ["__init__", "__new__", "__init_subclass__"];
|
|
87744
87916
|
const enforceParamNameMatch = !SymbolNameUtils.isDunderName(memberName);
|
|
87745
|
-
if (!exemptMethods.some((exempt) => exempt === memberName) && !SymbolNameUtils.isPrivateName(memberName)) {
|
|
87917
|
+
if (!exemptMethods.some((exempt) => exempt === memberName) && !SymbolNameUtils.isPrivateName(memberName) && !types_1.ClassType.isTypedDictClass(childClassType)) {
|
|
87746
87918
|
if (!this._evaluator.validateOverrideMethod(baseType, overrideType, childClassType, diagAddendum, enforceParamNameMatch)) {
|
|
87747
87919
|
const decl = (0, types_1.isFunction)(overrideType) && overrideType.details.declaration ? overrideType.details.declaration : (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overrideSymbol);
|
|
87748
87920
|
if (decl) {
|
|
@@ -88859,11 +89031,15 @@ var require_sourceFile = __commonJS({
|
|
|
88859
89031
|
return false;
|
|
88860
89032
|
}
|
|
88861
89033
|
try {
|
|
88862
|
-
|
|
88863
|
-
|
|
88864
|
-
|
|
88865
|
-
|
|
88866
|
-
|
|
89034
|
+
if (this.fileSystem.existsSync(this._filePath)) {
|
|
89035
|
+
const fileContents = this.fileSystem.readFileSync(this._filePath, "utf8");
|
|
89036
|
+
if (fileContents.length !== this._writableData.lastFileContentLength) {
|
|
89037
|
+
return true;
|
|
89038
|
+
}
|
|
89039
|
+
if (StringUtils.hashString(fileContents) !== this._writableData.lastFileContentHash) {
|
|
89040
|
+
return true;
|
|
89041
|
+
}
|
|
89042
|
+
} else {
|
|
88867
89043
|
return true;
|
|
88868
89044
|
}
|
|
88869
89045
|
} catch (error) {
|
|
@@ -106378,7 +106554,7 @@ var require_window = __commonJS({
|
|
|
106378
106554
|
var OperatorSubscriber_1 = require_OperatorSubscriber();
|
|
106379
106555
|
var noop_1 = require_noop();
|
|
106380
106556
|
var innerFrom_1 = require_innerFrom();
|
|
106381
|
-
function
|
|
106557
|
+
function window12(windowBoundaries) {
|
|
106382
106558
|
return lift_1.operate(function(source, subscriber) {
|
|
106383
106559
|
var windowSubject = new Subject_1.Subject();
|
|
106384
106560
|
subscriber.next(windowSubject.asObservable());
|
|
@@ -106402,7 +106578,7 @@ var require_window = __commonJS({
|
|
|
106402
106578
|
};
|
|
106403
106579
|
});
|
|
106404
106580
|
}
|
|
106405
|
-
exports.window =
|
|
106581
|
+
exports.window = window12;
|
|
106406
106582
|
}
|
|
106407
106583
|
});
|
|
106408
106584
|
|
|
@@ -106513,8 +106689,8 @@ var require_windowTime = __commonJS({
|
|
|
106513
106689
|
var windowRecords = [];
|
|
106514
106690
|
var restartOnClose = false;
|
|
106515
106691
|
var closeWindow = function(record) {
|
|
106516
|
-
var
|
|
106517
|
-
|
|
106692
|
+
var window12 = record.window, subs = record.subs;
|
|
106693
|
+
window12.complete();
|
|
106518
106694
|
subs.unsubscribe();
|
|
106519
106695
|
arrRemove_1.arrRemove(windowRecords, record);
|
|
106520
106696
|
restartOnClose && startWindow();
|
|
@@ -106547,8 +106723,8 @@ var require_windowTime = __commonJS({
|
|
|
106547
106723
|
};
|
|
106548
106724
|
var terminate = function(cb) {
|
|
106549
106725
|
loop(function(_a2) {
|
|
106550
|
-
var
|
|
106551
|
-
return cb(
|
|
106726
|
+
var window12 = _a2.window;
|
|
106727
|
+
return cb(window12);
|
|
106552
106728
|
});
|
|
106553
106729
|
cb(subscriber);
|
|
106554
106730
|
subscriber.unsubscribe();
|
|
@@ -106613,12 +106789,12 @@ var require_windowToggle = __commonJS({
|
|
|
106613
106789
|
subscriber.error(err);
|
|
106614
106790
|
};
|
|
106615
106791
|
innerFrom_1.innerFrom(openings).subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, function(openValue) {
|
|
106616
|
-
var
|
|
106617
|
-
windows.push(
|
|
106792
|
+
var window12 = new Subject_1.Subject();
|
|
106793
|
+
windows.push(window12);
|
|
106618
106794
|
var closingSubscription = new Subscription_1.Subscription();
|
|
106619
106795
|
var closeWindow = function() {
|
|
106620
|
-
arrRemove_1.arrRemove(windows,
|
|
106621
|
-
|
|
106796
|
+
arrRemove_1.arrRemove(windows, window12);
|
|
106797
|
+
window12.complete();
|
|
106622
106798
|
closingSubscription.unsubscribe();
|
|
106623
106799
|
};
|
|
106624
106800
|
var closingNotifier;
|
|
@@ -106628,7 +106804,7 @@ var require_windowToggle = __commonJS({
|
|
|
106628
106804
|
handleError(err);
|
|
106629
106805
|
return;
|
|
106630
106806
|
}
|
|
106631
|
-
subscriber.next(
|
|
106807
|
+
subscriber.next(window12.asObservable());
|
|
106632
106808
|
closingSubscription.add(closingNotifier.subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, closeWindow, noop_1.noop, handleError)));
|
|
106633
106809
|
}, noop_1.noop));
|
|
106634
106810
|
source.subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, function(value) {
|
|
@@ -106678,17 +106854,17 @@ var require_windowWhen = __commonJS({
|
|
|
106678
106854
|
var innerFrom_1 = require_innerFrom();
|
|
106679
106855
|
function windowWhen(closingSelector) {
|
|
106680
106856
|
return lift_1.operate(function(source, subscriber) {
|
|
106681
|
-
var
|
|
106857
|
+
var window12;
|
|
106682
106858
|
var closingSubscriber;
|
|
106683
106859
|
var handleError = function(err) {
|
|
106684
|
-
|
|
106860
|
+
window12.error(err);
|
|
106685
106861
|
subscriber.error(err);
|
|
106686
106862
|
};
|
|
106687
106863
|
var openWindow = function() {
|
|
106688
106864
|
closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
|
|
106689
|
-
|
|
106690
|
-
|
|
106691
|
-
subscriber.next(
|
|
106865
|
+
window12 === null || window12 === void 0 ? void 0 : window12.complete();
|
|
106866
|
+
window12 = new Subject_1.Subject();
|
|
106867
|
+
subscriber.next(window12.asObservable());
|
|
106692
106868
|
var closingNotifier;
|
|
106693
106869
|
try {
|
|
106694
106870
|
closingNotifier = innerFrom_1.innerFrom(closingSelector());
|
|
@@ -106700,13 +106876,13 @@ var require_windowWhen = __commonJS({
|
|
|
106700
106876
|
};
|
|
106701
106877
|
openWindow();
|
|
106702
106878
|
source.subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, function(value) {
|
|
106703
|
-
return
|
|
106879
|
+
return window12.next(value);
|
|
106704
106880
|
}, function() {
|
|
106705
|
-
|
|
106881
|
+
window12.complete();
|
|
106706
106882
|
subscriber.complete();
|
|
106707
106883
|
}, handleError, function() {
|
|
106708
106884
|
closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
|
|
106709
|
-
|
|
106885
|
+
window12 = null;
|
|
106710
106886
|
}));
|
|
106711
106887
|
});
|
|
106712
106888
|
}
|
|
@@ -109991,7 +110167,7 @@ var require_minimatch = __commonJS({
|
|
|
109991
110167
|
var require_named_js_regexp = __commonJS({
|
|
109992
110168
|
"node_modules/named-js-regexp/lib/named-js-regexp.js"(exports, module2) {
|
|
109993
110169
|
"use strict";
|
|
109994
|
-
(function(
|
|
110170
|
+
(function(window12) {
|
|
109995
110171
|
var validGroupName = /^[$_a-z][$_a-z0-9]*$/i;
|
|
109996
110172
|
var cache;
|
|
109997
110173
|
function parseRegex(text) {
|
|
@@ -110169,7 +110345,7 @@ var require_named_js_regexp = __commonJS({
|
|
|
110169
110345
|
return createNamedRegex;
|
|
110170
110346
|
});
|
|
110171
110347
|
} else {
|
|
110172
|
-
|
|
110348
|
+
window12.createNamedRegex = createNamedRegex;
|
|
110173
110349
|
}
|
|
110174
110350
|
})(typeof window === "undefined" ? exports : window);
|
|
110175
110351
|
}
|
|
@@ -110181,7 +110357,7 @@ __export(src_exports, {
|
|
|
110181
110357
|
activate: () => activate
|
|
110182
110358
|
});
|
|
110183
110359
|
module.exports = __toCommonJS(src_exports);
|
|
110184
|
-
var
|
|
110360
|
+
var import_coc33 = require("coc.nvim");
|
|
110185
110361
|
var import_fs8 = require("fs");
|
|
110186
110362
|
var import_path7 = require("path");
|
|
110187
110363
|
var import_semver2 = __toESM(require_semver2());
|
|
@@ -110410,6 +110586,7 @@ var _PythonSettings = class _PythonSettings {
|
|
|
110410
110586
|
}
|
|
110411
110587
|
this.formatting.autopep8Path = this.getAbsolutePath(systemVariables.resolveAny(this.formatting.autopep8Path));
|
|
110412
110588
|
this.formatting.yapfPath = this.getAbsolutePath(systemVariables.resolveAny(this.formatting.yapfPath));
|
|
110589
|
+
this.formatting.ruffPath = this.getAbsolutePath(systemVariables.resolveAny(this.formatting.ruffPath));
|
|
110413
110590
|
this.formatting.blackPath = this.getAbsolutePath(systemVariables.resolveAny(this.formatting.blackPath));
|
|
110414
110591
|
this.formatting.pyinkPath = this.getAbsolutePath(systemVariables.resolveAny(this.formatting.pyinkPath));
|
|
110415
110592
|
this.formatting.blackdPath = this.getAbsolutePath(systemVariables.resolveAny(this.formatting.blackdPath));
|
|
@@ -110998,7 +111175,7 @@ var PythonCodeActionProvider = class {
|
|
|
110998
111175
|
};
|
|
110999
111176
|
|
|
111000
111177
|
// src/features/formatting.ts
|
|
111001
|
-
var
|
|
111178
|
+
var import_coc10 = require("coc.nvim");
|
|
111002
111179
|
|
|
111003
111180
|
// src/features/formatters/baseFormatter.ts
|
|
111004
111181
|
var import_coc5 = require("coc.nvim");
|
|
@@ -111836,6 +112013,32 @@ var PyinkFormatter = class extends BaseFormatter {
|
|
|
111836
112013
|
}
|
|
111837
112014
|
};
|
|
111838
112015
|
|
|
112016
|
+
// src/features/formatters/ruff.ts
|
|
112017
|
+
var import_coc9 = require("coc.nvim");
|
|
112018
|
+
var RuffFormatter = class extends BaseFormatter {
|
|
112019
|
+
constructor(pythonSettings, outputChannel) {
|
|
112020
|
+
super("ruff", pythonSettings, outputChannel);
|
|
112021
|
+
this.pythonSettings = pythonSettings;
|
|
112022
|
+
this.outputChannel = outputChannel;
|
|
112023
|
+
}
|
|
112024
|
+
formatDocument(document, options, token, range) {
|
|
112025
|
+
const formatSelection = range ? range : false;
|
|
112026
|
+
if (formatSelection) {
|
|
112027
|
+
const errorMessage = async () => {
|
|
112028
|
+
this.outputChannel.appendLine('Ruff does not support the "Format Selection" command');
|
|
112029
|
+
import_coc9.window.showErrorMessage('Ruff does not support the "Format Selection" command');
|
|
112030
|
+
return [];
|
|
112031
|
+
};
|
|
112032
|
+
return errorMessage();
|
|
112033
|
+
}
|
|
112034
|
+
const ruffArgs = ["format", "--diff", "--silent"];
|
|
112035
|
+
if (this.pythonSettings.formatting.ruffArgs.length > 0) {
|
|
112036
|
+
ruffArgs.push(...this.pythonSettings.formatting.ruffArgs);
|
|
112037
|
+
}
|
|
112038
|
+
return super.provideDocumentFormattingEdits(document, options, token, ruffArgs);
|
|
112039
|
+
}
|
|
112040
|
+
};
|
|
112041
|
+
|
|
111839
112042
|
// src/features/formatters/yapf.ts
|
|
111840
112043
|
var YapfFormatter = class extends BaseFormatter {
|
|
111841
112044
|
constructor(pythonSettings, outputChannel) {
|
|
@@ -111865,7 +112068,7 @@ var PythonFormattingEditProvider = class {
|
|
|
111865
112068
|
this.formatters = /* @__PURE__ */ new Map();
|
|
111866
112069
|
this.disposables = [];
|
|
111867
112070
|
this.pythonSettings = PythonSettings.getInstance();
|
|
111868
|
-
this.outputChannel =
|
|
112071
|
+
this.outputChannel = import_coc10.window.createOutputChannel("coc-pyright-formatting");
|
|
111869
112072
|
const provider = this.pythonSettings.formatting.provider;
|
|
111870
112073
|
switch (provider) {
|
|
111871
112074
|
case "black":
|
|
@@ -111880,6 +112083,9 @@ var PythonFormattingEditProvider = class {
|
|
|
111880
112083
|
case "yapf":
|
|
111881
112084
|
this.formatters.set("yapf", new YapfFormatter(this.pythonSettings, this.outputChannel));
|
|
111882
112085
|
break;
|
|
112086
|
+
case "ruff":
|
|
112087
|
+
this.formatters.set("ruff", new RuffFormatter(this.pythonSettings, this.outputChannel));
|
|
112088
|
+
break;
|
|
111883
112089
|
case "autopep8":
|
|
111884
112090
|
this.formatters.set("autopep8", new AutoPep8Formatter(this.pythonSettings, this.outputChannel));
|
|
111885
112091
|
break;
|
|
@@ -111914,12 +112120,12 @@ var PythonFormattingEditProvider = class {
|
|
|
111914
112120
|
};
|
|
111915
112121
|
|
|
111916
112122
|
// src/features/importCompletion.ts
|
|
111917
|
-
var
|
|
112123
|
+
var import_coc11 = require("coc.nvim");
|
|
111918
112124
|
var ImportCompletionProvider = class {
|
|
111919
112125
|
async provideCompletionItems(document, position, token, context) {
|
|
111920
112126
|
if (context.triggerCharacter !== " ")
|
|
111921
112127
|
return [];
|
|
111922
|
-
const line = document.getText(
|
|
112128
|
+
const line = document.getText(import_coc11.Range.create(position.line, 0, position.line, position.character)).trim();
|
|
111923
112129
|
if (!line.includes("from") && !line.includes("import"))
|
|
111924
112130
|
return [];
|
|
111925
112131
|
const parts = line.split(" ");
|
|
@@ -111928,7 +112134,7 @@ var ImportCompletionProvider = class {
|
|
|
111928
112134
|
if (first !== last && first === "from" && last !== "import" && !last.endsWith(",")) {
|
|
111929
112135
|
return [{ label: "import" }];
|
|
111930
112136
|
}
|
|
111931
|
-
const source =
|
|
112137
|
+
const source = import_coc11.sources.sources.find((s) => s.name.includes("pyright"));
|
|
111932
112138
|
if (!source)
|
|
111933
112139
|
return [];
|
|
111934
112140
|
const result = await source.doComplete(context.option, token);
|
|
@@ -111936,26 +112142,26 @@ var ImportCompletionProvider = class {
|
|
|
111936
112142
|
return [];
|
|
111937
112143
|
const items = [];
|
|
111938
112144
|
for (const o of result.items) {
|
|
111939
|
-
items.push({ label: o.label || o.word, sortText: o.sortText, kind:
|
|
112145
|
+
items.push({ label: o.label || o.word, sortText: o.sortText, kind: import_coc11.CompletionItemKind.Module, filterText: o.filterText });
|
|
111940
112146
|
}
|
|
111941
112147
|
return items;
|
|
111942
112148
|
}
|
|
111943
112149
|
};
|
|
111944
112150
|
|
|
111945
112151
|
// src/features/inlayHints.ts
|
|
111946
|
-
var
|
|
112152
|
+
var import_coc12 = require("coc.nvim");
|
|
111947
112153
|
var TypeInlayHintsProvider = class {
|
|
111948
112154
|
constructor(client) {
|
|
111949
112155
|
this.client = client;
|
|
111950
|
-
this._onDidChangeInlayHints = new
|
|
112156
|
+
this._onDidChangeInlayHints = new import_coc12.Emitter();
|
|
111951
112157
|
this.onDidChangeInlayHints = this._onDidChangeInlayHints.event;
|
|
111952
|
-
|
|
112158
|
+
import_coc12.workspace.onDidChangeConfiguration((e) => {
|
|
111953
112159
|
if (e.affectsConfiguration("pyright.inlayHints")) {
|
|
111954
112160
|
this._onDidChangeInlayHints.fire();
|
|
111955
112161
|
}
|
|
111956
112162
|
});
|
|
111957
|
-
|
|
111958
|
-
const doc =
|
|
112163
|
+
import_coc12.workspace.onDidChangeTextDocument((e) => {
|
|
112164
|
+
const doc = import_coc12.workspace.getDocument(e.bufnr);
|
|
111959
112165
|
if (doc.languageId === "python") {
|
|
111960
112166
|
this._onDidChangeInlayHints.fire();
|
|
111961
112167
|
}
|
|
@@ -111995,7 +112201,7 @@ var TypeInlayHintsProvider = class {
|
|
|
111995
112201
|
];
|
|
111996
112202
|
switch (item.inlayHintType) {
|
|
111997
112203
|
case "variable":
|
|
111998
|
-
inlayHintPosition =
|
|
112204
|
+
inlayHintPosition = import_coc12.Position.create(startPosition.line, endPosition.character + 1);
|
|
111999
112205
|
break;
|
|
112000
112206
|
case "functionReturn":
|
|
112001
112207
|
inlayHintPosition = endPosition;
|
|
@@ -112041,13 +112247,13 @@ var TypeInlayHintsProvider = class {
|
|
|
112041
112247
|
}
|
|
112042
112248
|
}
|
|
112043
112249
|
isDisableVariableTypes(inlayHintType) {
|
|
112044
|
-
if (!
|
|
112250
|
+
if (!import_coc12.workspace.getConfiguration("pyright").get("inlayHints.variableTypes") && inlayHintType === "variable") {
|
|
112045
112251
|
return true;
|
|
112046
112252
|
}
|
|
112047
112253
|
return false;
|
|
112048
112254
|
}
|
|
112049
112255
|
isDisableFunctionReturnTypes(inlayHintType) {
|
|
112050
|
-
if (!
|
|
112256
|
+
if (!import_coc12.workspace.getConfiguration("pyright").get("inlayHints.functionReturnTypes") && inlayHintType === "functionReturn") {
|
|
112051
112257
|
return true;
|
|
112052
112258
|
}
|
|
112053
112259
|
return false;
|
|
@@ -112056,7 +112262,7 @@ var TypeInlayHintsProvider = class {
|
|
|
112056
112262
|
|
|
112057
112263
|
// src/features/semanticTokens.ts
|
|
112058
112264
|
var import_positionUtils = __toESM(require_positionUtils());
|
|
112059
|
-
var
|
|
112265
|
+
var import_coc13 = require("coc.nvim");
|
|
112060
112266
|
var tokenTypes = Object.keys(TokenTypes).filter((key) => isNaN(Number(key)));
|
|
112061
112267
|
var tokenModifiers = [];
|
|
112062
112268
|
var PythonSemanticTokensProvider = class {
|
|
@@ -112069,7 +112275,7 @@ var PythonSemanticTokensProvider = class {
|
|
|
112069
112275
|
return null;
|
|
112070
112276
|
if (token && token.isCancellationRequested)
|
|
112071
112277
|
return null;
|
|
112072
|
-
const builder = new
|
|
112278
|
+
const builder = new import_coc13.SemanticTokensBuilder(this.legend);
|
|
112073
112279
|
for (const item of parsed.tokenizerOutput.tokens._items) {
|
|
112074
112280
|
const range = (0, import_positionUtils.convertTextRangeToRange)(item, parsed.tokenizerOutput.lines);
|
|
112075
112281
|
if ([0, 1, 2, 3, 4, 7].includes(item.type))
|
|
@@ -112095,7 +112301,7 @@ var PythonSemanticTokensProvider = class {
|
|
|
112095
112301
|
};
|
|
112096
112302
|
|
|
112097
112303
|
// src/features/sortImports.ts
|
|
112098
|
-
var
|
|
112304
|
+
var import_coc14 = require("coc.nvim");
|
|
112099
112305
|
var import_fs4 = __toESM(require("fs"));
|
|
112100
112306
|
var path5 = __toESM(require("path"));
|
|
112101
112307
|
var import_which3 = __toESM(require_lib());
|
|
@@ -112116,13 +112322,13 @@ function getSortProviderInfo(provider, extensionRoot) {
|
|
|
112116
112322
|
}
|
|
112117
112323
|
} else if (provider === "ruff") {
|
|
112118
112324
|
const ruffPath = pythonSettings.linting.ruffPath;
|
|
112119
|
-
execPath = import_which3.default.sync(
|
|
112325
|
+
execPath = import_which3.default.sync(import_coc14.workspace.expand(ruffPath), { nothrow: true }) || "";
|
|
112120
112326
|
args = ["--quiet", "--diff", "--select", "I001"];
|
|
112121
112327
|
}
|
|
112122
112328
|
return execPath ? { execPath, args } : null;
|
|
112123
112329
|
}
|
|
112124
112330
|
async function generateImportsDiff(document, extensionRoot) {
|
|
112125
|
-
const config =
|
|
112331
|
+
const config = import_coc14.workspace.getConfiguration("pyright");
|
|
112126
112332
|
const provider = config.get("organizeimports.provider", "pyright");
|
|
112127
112333
|
const executionInfo = getSortProviderInfo(provider, extensionRoot);
|
|
112128
112334
|
if (!executionInfo)
|
|
@@ -112135,7 +112341,7 @@ async function generateImportsDiff(document, extensionRoot) {
|
|
|
112135
112341
|
return result.stdout;
|
|
112136
112342
|
}
|
|
112137
112343
|
async function sortImports(extensionRoot, outputChannel) {
|
|
112138
|
-
const doc = await
|
|
112344
|
+
const doc = await import_coc14.workspace.document;
|
|
112139
112345
|
if (!doc || doc.filetype !== "python" || doc.lineCount <= 1) {
|
|
112140
112346
|
return;
|
|
112141
112347
|
}
|
|
@@ -112154,15 +112360,15 @@ async function sortImports(extensionRoot, outputChannel) {
|
|
|
112154
112360
|
}
|
|
112155
112361
|
outputChannel.appendLine(`${"#".repeat(10)} sortImports Error ${"#".repeat(10)}`);
|
|
112156
112362
|
outputChannel.appendLine(message);
|
|
112157
|
-
|
|
112363
|
+
import_coc14.window.showErrorMessage(`Failed to sort imports`);
|
|
112158
112364
|
}
|
|
112159
112365
|
}
|
|
112160
112366
|
|
|
112161
112367
|
// src/features/lintting.ts
|
|
112162
|
-
var
|
|
112368
|
+
var import_coc29 = require("coc.nvim");
|
|
112163
112369
|
|
|
112164
112370
|
// src/features/linters/lintingEngine.ts
|
|
112165
|
-
var
|
|
112371
|
+
var import_coc28 = require("coc.nvim");
|
|
112166
112372
|
var import_fs6 = __toESM(require("fs"));
|
|
112167
112373
|
var import_minimatch = __toESM(require_minimatch());
|
|
112168
112374
|
var import_path5 = __toESM(require("path"));
|
|
@@ -112213,11 +112419,11 @@ var LinterErrors;
|
|
|
112213
112419
|
})(LinterErrors || (LinterErrors = {}));
|
|
112214
112420
|
|
|
112215
112421
|
// src/features/linters/bandit.ts
|
|
112216
|
-
var
|
|
112422
|
+
var import_coc16 = require("coc.nvim");
|
|
112217
112423
|
|
|
112218
112424
|
// src/features/linters/baseLinter.ts
|
|
112219
112425
|
var import_child_process3 = require("child_process");
|
|
112220
|
-
var
|
|
112426
|
+
var import_coc15 = require("coc.nvim");
|
|
112221
112427
|
var import_named_js_regexp = __toESM(require_named_js_regexp());
|
|
112222
112428
|
var REGEX = "(?<line>\\d+),(?<column>-?\\d+),(?<type>\\w+),(?<code>\\w+\\d+):(?<message>.*)\\r?(\\n|$)";
|
|
112223
112429
|
function matchNamedRegEx(data, regex) {
|
|
@@ -112290,7 +112496,7 @@ var BaseLinter = class {
|
|
|
112290
112496
|
command = this.pythonSettings.pythonPath;
|
|
112291
112497
|
args = ["-m", executionInfo.moduleName, ...args];
|
|
112292
112498
|
}
|
|
112293
|
-
const child = (0, import_child_process3.spawn)(command, args, { cwd:
|
|
112499
|
+
const child = (0, import_child_process3.spawn)(command, args, { cwd: import_coc15.workspace.root });
|
|
112294
112500
|
return new Promise((resolve) => {
|
|
112295
112501
|
child.stdin.setDefaultEncoding("utf8");
|
|
112296
112502
|
child.stdin.write(document.getText());
|
|
@@ -112305,11 +112511,11 @@ var BaseLinter = class {
|
|
|
112305
112511
|
});
|
|
112306
112512
|
}
|
|
112307
112513
|
async run(args, document, token, regEx = REGEX) {
|
|
112308
|
-
if (!this.info.isEnabled(
|
|
112514
|
+
if (!this.info.isEnabled(import_coc15.Uri.parse(document.uri))) {
|
|
112309
112515
|
return [];
|
|
112310
112516
|
}
|
|
112311
112517
|
try {
|
|
112312
|
-
const executionInfo = this.info.getExecutionInfo(args,
|
|
112518
|
+
const executionInfo = this.info.getExecutionInfo(args, import_coc15.Uri.parse(document.uri));
|
|
112313
112519
|
this.outputChannel.appendLine(`${"#".repeat(10)} Run linter ${this.info.id}:`);
|
|
112314
112520
|
this.outputChannel.appendLine(JSON.stringify(executionInfo));
|
|
112315
112521
|
this.outputChannel.appendLine("");
|
|
@@ -112318,7 +112524,7 @@ var BaseLinter = class {
|
|
|
112318
112524
|
result = await this.stdinRun(executionInfo, document);
|
|
112319
112525
|
} else {
|
|
112320
112526
|
const pythonToolsExecutionService = new PythonExecutionService();
|
|
112321
|
-
result = (await pythonToolsExecutionService.exec(executionInfo, { cwd:
|
|
112527
|
+
result = (await pythonToolsExecutionService.exec(executionInfo, { cwd: import_coc15.workspace.root, token, mergeStdOutErr: false })).stdout;
|
|
112322
112528
|
}
|
|
112323
112529
|
this.outputChannel.append(`${"#".repeat(10)} Linting Output - ${this.info.id} ${"#".repeat(10)}
|
|
112324
112530
|
`);
|
|
@@ -112370,7 +112576,7 @@ var Bandit = class extends BaseLinter {
|
|
|
112370
112576
|
super(info, outputChannel);
|
|
112371
112577
|
}
|
|
112372
112578
|
async runLinter(document, cancellation) {
|
|
112373
|
-
const messages = await this.run(["-f", "custom", "--msg-template", "{line},0,{severity},{test_id}:{msg}", "-n", "-1",
|
|
112579
|
+
const messages = await this.run(["-f", "custom", "--msg-template", "{line},0,{severity},{test_id}:{msg}", "-n", "-1", import_coc16.Uri.parse(document.uri).fsPath], document, cancellation);
|
|
112374
112580
|
messages.forEach((msg) => {
|
|
112375
112581
|
msg.severity = severityMapping[msg.type];
|
|
112376
112582
|
});
|
|
@@ -112379,14 +112585,14 @@ var Bandit = class extends BaseLinter {
|
|
|
112379
112585
|
};
|
|
112380
112586
|
|
|
112381
112587
|
// src/features/linters/flake8.ts
|
|
112382
|
-
var
|
|
112588
|
+
var import_coc17 = require("coc.nvim");
|
|
112383
112589
|
var COLUMN_OFF_SET = 1;
|
|
112384
112590
|
var Flake8 = class extends BaseLinter {
|
|
112385
112591
|
constructor(info, outputChannel) {
|
|
112386
112592
|
super(info, outputChannel, COLUMN_OFF_SET);
|
|
112387
112593
|
}
|
|
112388
112594
|
async runLinter(document, cancellation) {
|
|
112389
|
-
const fsPath =
|
|
112595
|
+
const fsPath = import_coc17.Uri.parse(document.uri).fsPath;
|
|
112390
112596
|
const args = ["--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s", "--exit-zero"];
|
|
112391
112597
|
if (this.info.stdinSupport) {
|
|
112392
112598
|
args.push("--stdin-display-name", fsPath, "-");
|
|
@@ -112402,7 +112608,7 @@ var Flake8 = class extends BaseLinter {
|
|
|
112402
112608
|
};
|
|
112403
112609
|
|
|
112404
112610
|
// src/features/linters/linterInfo.ts
|
|
112405
|
-
var
|
|
112611
|
+
var import_coc18 = require("coc.nvim");
|
|
112406
112612
|
var path6 = __toESM(require("path"));
|
|
112407
112613
|
var import_which4 = __toESM(require_lib());
|
|
112408
112614
|
var LinterInfo = class {
|
|
@@ -112439,7 +112645,7 @@ var LinterInfo = class {
|
|
|
112439
112645
|
return Array.isArray(args) ? args : [];
|
|
112440
112646
|
}
|
|
112441
112647
|
getExecutionInfo(customArgs, resource) {
|
|
112442
|
-
const execPath = import_which4.default.sync(
|
|
112648
|
+
const execPath = import_which4.default.sync(import_coc18.workspace.expand(this.pathName(resource)), { nothrow: true }) || this.pathName(resource);
|
|
112443
112649
|
const args = this.linterArgs(resource).concat(customArgs);
|
|
112444
112650
|
let moduleName;
|
|
112445
112651
|
if (path6.basename(execPath) === execPath) {
|
|
@@ -112450,7 +112656,7 @@ var LinterInfo = class {
|
|
|
112450
112656
|
};
|
|
112451
112657
|
|
|
112452
112658
|
// src/features/linters/mypy.ts
|
|
112453
|
-
var
|
|
112659
|
+
var import_coc19 = require("coc.nvim");
|
|
112454
112660
|
var COLUMN_OFF_SET2 = 1;
|
|
112455
112661
|
var REGEX2 = "(?<file>[^:]+):(?<line>\\d+)(:(?<column>\\d+))?: (?<type>\\w+): (?<message>.*)\\r?(\\n|$)";
|
|
112456
112662
|
var MyPy = class extends BaseLinter {
|
|
@@ -112458,7 +112664,7 @@ var MyPy = class extends BaseLinter {
|
|
|
112458
112664
|
super(info, outputChannel, COLUMN_OFF_SET2);
|
|
112459
112665
|
}
|
|
112460
112666
|
async runLinter(document, cancellation) {
|
|
112461
|
-
const args = ["--python-executable", this.pythonSettings.pythonPath,
|
|
112667
|
+
const args = ["--python-executable", this.pythonSettings.pythonPath, import_coc19.Uri.parse(document.uri).fsPath];
|
|
112462
112668
|
const messages = await this.run(args, document, cancellation, REGEX2);
|
|
112463
112669
|
messages.forEach((msg) => {
|
|
112464
112670
|
msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.mypyCategorySeverity);
|
|
@@ -112469,14 +112675,14 @@ var MyPy = class extends BaseLinter {
|
|
|
112469
112675
|
};
|
|
112470
112676
|
|
|
112471
112677
|
// src/features/linters/prospector.ts
|
|
112472
|
-
var
|
|
112678
|
+
var import_coc20 = require("coc.nvim");
|
|
112473
112679
|
var import_path4 = __toESM(require("path"));
|
|
112474
112680
|
var Prospector = class extends BaseLinter {
|
|
112475
112681
|
constructor(info, outputChannel) {
|
|
112476
112682
|
super(info, outputChannel);
|
|
112477
112683
|
}
|
|
112478
112684
|
async runLinter(document, cancellation) {
|
|
112479
|
-
const relativePath = import_path4.default.relative(
|
|
112685
|
+
const relativePath = import_path4.default.relative(import_coc20.workspace.root, import_coc20.Uri.parse(document.uri).fsPath);
|
|
112480
112686
|
return this.run(["--absolute-paths", "--output-format=json", relativePath], document, cancellation);
|
|
112481
112687
|
}
|
|
112482
112688
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
@@ -112504,14 +112710,14 @@ var Prospector = class extends BaseLinter {
|
|
|
112504
112710
|
};
|
|
112505
112711
|
|
|
112506
112712
|
// src/features/linters/pycodestyle.ts
|
|
112507
|
-
var
|
|
112713
|
+
var import_coc21 = require("coc.nvim");
|
|
112508
112714
|
var COLUMN_OFF_SET3 = 1;
|
|
112509
112715
|
var PyCodeStyle = class extends BaseLinter {
|
|
112510
112716
|
constructor(info, outputChannel) {
|
|
112511
112717
|
super(info, outputChannel, COLUMN_OFF_SET3);
|
|
112512
112718
|
}
|
|
112513
112719
|
async runLinter(document, cancellation) {
|
|
112514
|
-
const messages = await this.run(["--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s",
|
|
112720
|
+
const messages = await this.run(["--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s", import_coc21.Uri.parse(document.uri).fsPath], document, cancellation);
|
|
112515
112721
|
messages.forEach((msg) => {
|
|
112516
112722
|
msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.pycodestyleCategorySeverity);
|
|
112517
112723
|
});
|
|
@@ -112520,17 +112726,17 @@ var PyCodeStyle = class extends BaseLinter {
|
|
|
112520
112726
|
};
|
|
112521
112727
|
|
|
112522
112728
|
// src/features/linters/pydocstyle.ts
|
|
112523
|
-
var
|
|
112729
|
+
var import_coc22 = require("coc.nvim");
|
|
112524
112730
|
var path8 = __toESM(require("path"));
|
|
112525
112731
|
var PyDocStyle = class extends BaseLinter {
|
|
112526
112732
|
constructor(info, outputChannel) {
|
|
112527
112733
|
super(info, outputChannel);
|
|
112528
112734
|
}
|
|
112529
112735
|
async runLinter(document, cancellation) {
|
|
112530
|
-
const baseFileName = path8.basename(
|
|
112736
|
+
const baseFileName = path8.basename(import_coc22.Uri.parse(document.uri).fsPath);
|
|
112531
112737
|
if (/^test_.*\.py$/.test(baseFileName))
|
|
112532
112738
|
return [];
|
|
112533
|
-
const messages = await this.run([
|
|
112739
|
+
const messages = await this.run([import_coc22.Uri.parse(document.uri).fsPath], document, cancellation);
|
|
112534
112740
|
messages.forEach((msg) => {
|
|
112535
112741
|
msg.severity = 2 /* Warning */;
|
|
112536
112742
|
});
|
|
@@ -112538,14 +112744,14 @@ var PyDocStyle = class extends BaseLinter {
|
|
|
112538
112744
|
}
|
|
112539
112745
|
async parseMessages(output, document) {
|
|
112540
112746
|
let outputLines = output.split(/\r?\n/g);
|
|
112541
|
-
const baseFileName = path8.basename(
|
|
112747
|
+
const baseFileName = path8.basename(import_coc22.Uri.parse(document.uri).fsPath);
|
|
112542
112748
|
const maxLines = this.pythonSettings.linting.maxNumberOfProblems * 2;
|
|
112543
112749
|
const oldOutputLines = outputLines.filter((line) => line.length > 0);
|
|
112544
112750
|
outputLines = [];
|
|
112545
112751
|
for (let counter = 0; counter < oldOutputLines.length / 2; counter += 1) {
|
|
112546
112752
|
outputLines.push(oldOutputLines[2 * counter] + oldOutputLines[2 * counter + 1]);
|
|
112547
112753
|
}
|
|
112548
|
-
const doc =
|
|
112754
|
+
const doc = import_coc22.workspace.getDocument(document.uri);
|
|
112549
112755
|
return outputLines.filter((value, index) => index < maxLines && value.indexOf(":") >= 0).map((line) => {
|
|
112550
112756
|
if (this.isWindows) {
|
|
112551
112757
|
return line.substring(line.indexOf(`${baseFileName}:`) + baseFileName.length + 1).trim();
|
|
@@ -112585,14 +112791,14 @@ var PyDocStyle = class extends BaseLinter {
|
|
|
112585
112791
|
};
|
|
112586
112792
|
|
|
112587
112793
|
// src/features/linters/pyflakes.ts
|
|
112588
|
-
var
|
|
112794
|
+
var import_coc23 = require("coc.nvim");
|
|
112589
112795
|
var REGEX3 = "(?<file>.*.py):(?<line>\\d+):(?<column>\\d+): (?<message>.*)\\r?(\\n|$)";
|
|
112590
112796
|
var Pyflakes = class extends BaseLinter {
|
|
112591
112797
|
constructor(info, outputChannel) {
|
|
112592
112798
|
super(info, outputChannel);
|
|
112593
112799
|
}
|
|
112594
112800
|
async runLinter(document, cancellation) {
|
|
112595
|
-
const messages = await this.run([
|
|
112801
|
+
const messages = await this.run([import_coc23.Uri.parse(document.uri).fsPath], document, cancellation, REGEX3);
|
|
112596
112802
|
messages.forEach((msg) => {
|
|
112597
112803
|
msg.severity = 2 /* Warning */;
|
|
112598
112804
|
});
|
|
@@ -112601,7 +112807,7 @@ var Pyflakes = class extends BaseLinter {
|
|
|
112601
112807
|
};
|
|
112602
112808
|
|
|
112603
112809
|
// src/features/linters/pylama.ts
|
|
112604
|
-
var
|
|
112810
|
+
var import_coc24 = require("coc.nvim");
|
|
112605
112811
|
var REGEX4 = "(?<file>.py):(?<line>\\d+):(?<column>\\d+): \\[(?<type>\\w+)\\] (?<code>\\w\\d+):? (?<message>.*)\\r?(\\n|$)";
|
|
112606
112812
|
var COLUMN_OFF_SET4 = 1;
|
|
112607
112813
|
var Pylama = class extends BaseLinter {
|
|
@@ -112609,7 +112815,7 @@ var Pylama = class extends BaseLinter {
|
|
|
112609
112815
|
super(info, outputChannel, COLUMN_OFF_SET4);
|
|
112610
112816
|
}
|
|
112611
112817
|
async runLinter(document, cancellation) {
|
|
112612
|
-
const messages = await this.run(["--format=parsable",
|
|
112818
|
+
const messages = await this.run(["--format=parsable", import_coc24.Uri.parse(document.uri).fsPath], document, cancellation, REGEX4);
|
|
112613
112819
|
messages.forEach((msg) => {
|
|
112614
112820
|
msg.severity = 2 /* Warning */;
|
|
112615
112821
|
});
|
|
@@ -112618,7 +112824,7 @@ var Pylama = class extends BaseLinter {
|
|
|
112618
112824
|
};
|
|
112619
112825
|
|
|
112620
112826
|
// src/features/linters/pylint.ts
|
|
112621
|
-
var
|
|
112827
|
+
var import_coc25 = require("coc.nvim");
|
|
112622
112828
|
var REGEX5 = "(?<line>\\d+),(?<column>-?\\d+),(?<type>\\w+),(?<code>[\\w-]+):(?<message>.*)\\r?(\\n|$)";
|
|
112623
112829
|
var Pylint = class extends BaseLinter {
|
|
112624
112830
|
constructor(info, outputChannel) {
|
|
@@ -112629,7 +112835,7 @@ var Pylint = class extends BaseLinter {
|
|
|
112629
112835
|
if (this.info.stdinSupport) {
|
|
112630
112836
|
args.push("--from-stdin");
|
|
112631
112837
|
}
|
|
112632
|
-
args.push(
|
|
112838
|
+
args.push(import_coc25.Uri.parse(document.uri).fsPath);
|
|
112633
112839
|
const messages = await this.run(args, document, cancellation, REGEX5);
|
|
112634
112840
|
messages.forEach((msg) => {
|
|
112635
112841
|
msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.pylintCategorySeverity);
|
|
@@ -112639,7 +112845,7 @@ var Pylint = class extends BaseLinter {
|
|
|
112639
112845
|
};
|
|
112640
112846
|
|
|
112641
112847
|
// src/features/linters/pytype.ts
|
|
112642
|
-
var
|
|
112848
|
+
var import_coc26 = require("coc.nvim");
|
|
112643
112849
|
var import_fs5 = __toESM(require("fs"));
|
|
112644
112850
|
var path9 = __toESM(require("path"));
|
|
112645
112851
|
var pytypecfg = "pytype.cfg";
|
|
@@ -112703,17 +112909,17 @@ var Pytype = class extends BaseLinter {
|
|
|
112703
112909
|
}
|
|
112704
112910
|
async runLinter(document, cancellation) {
|
|
112705
112911
|
const args = [];
|
|
112706
|
-
if (await this.hasConfigurationFile(
|
|
112912
|
+
if (await this.hasConfigurationFile(import_coc26.workspace.root)) {
|
|
112707
112913
|
args.push(...["--config", pytypecfg]);
|
|
112708
112914
|
}
|
|
112709
|
-
args.push(
|
|
112915
|
+
args.push(import_coc26.Uri.parse(document.uri).fsPath);
|
|
112710
112916
|
return await this.run(args, document, cancellation, REGEX6);
|
|
112711
112917
|
}
|
|
112712
112918
|
async parseMessages(output, document, regEx) {
|
|
112713
112919
|
const outputLines = output.split(/\r?\n/g).filter((line) => line.startsWith("File"));
|
|
112714
112920
|
const newOutput = outputLines.join("\n");
|
|
112715
112921
|
const messages = (await super.parseMessages(newOutput, document, regEx)).filter((msg) => {
|
|
112716
|
-
return msg.file && msg.file ===
|
|
112922
|
+
return msg.file && msg.file === import_coc26.Uri.parse(document.uri).fsPath;
|
|
112717
112923
|
});
|
|
112718
112924
|
for (const msg of messages) {
|
|
112719
112925
|
msg.type = "Hint";
|
|
@@ -112757,7 +112963,7 @@ var Pytype = class extends BaseLinter {
|
|
|
112757
112963
|
};
|
|
112758
112964
|
|
|
112759
112965
|
// src/features/linters/ruff.ts
|
|
112760
|
-
var
|
|
112966
|
+
var import_coc27 = require("coc.nvim");
|
|
112761
112967
|
var COLUMN_OFF_SET5 = 1;
|
|
112762
112968
|
var Ruff = class extends BaseLinter {
|
|
112763
112969
|
constructor(info, outputChannel) {
|
|
@@ -112766,11 +112972,11 @@ var Ruff = class extends BaseLinter {
|
|
|
112766
112972
|
fixToWorkspaceEdit(filename, fix) {
|
|
112767
112973
|
if (!fix)
|
|
112768
112974
|
return null;
|
|
112769
|
-
const u =
|
|
112975
|
+
const u = import_coc27.Uri.parse(filename).toString();
|
|
112770
112976
|
if (fix.edits && fix.edits.length) {
|
|
112771
112977
|
const changes = fix.edits.map((edit) => {
|
|
112772
|
-
const range =
|
|
112773
|
-
return
|
|
112978
|
+
const range = import_coc27.Range.create(edit.location.row - 1, edit.location.column, edit.end_location.row - 1, edit.end_location.column);
|
|
112979
|
+
return import_coc27.TextEdit.replace(range, edit.content);
|
|
112774
112980
|
});
|
|
112775
112981
|
return {
|
|
112776
112982
|
title: `Ruff: ${fix.message}`,
|
|
@@ -112781,12 +112987,12 @@ var Ruff = class extends BaseLinter {
|
|
|
112781
112987
|
}
|
|
112782
112988
|
};
|
|
112783
112989
|
} else if (fix.location && fix.end_location) {
|
|
112784
|
-
const range =
|
|
112990
|
+
const range = import_coc27.Range.create(fix.location.row - 1, fix.location.column, fix.end_location.row - 1, fix.end_location.column);
|
|
112785
112991
|
return {
|
|
112786
112992
|
title: `Ruff: ${fix.message}`,
|
|
112787
112993
|
edit: {
|
|
112788
112994
|
changes: {
|
|
112789
|
-
[u]: [
|
|
112995
|
+
[u]: [import_coc27.TextEdit.replace(range, fix.content || "")]
|
|
112790
112996
|
}
|
|
112791
112997
|
}
|
|
112792
112998
|
};
|
|
@@ -112806,7 +113012,7 @@ var Ruff = class extends BaseLinter {
|
|
|
112806
113012
|
type: "",
|
|
112807
113013
|
severity: 2 /* Warning */,
|
|
112808
113014
|
// https://github.com/charliermarsh/ruff/issues/645
|
|
112809
|
-
tags: ["F401", "F841"].includes(msg.code) ? [
|
|
113015
|
+
tags: ["F401", "F841"].includes(msg.code) ? [import_coc27.DiagnosticTag.Unnecessary] : [],
|
|
112810
113016
|
provider: this.info.id,
|
|
112811
113017
|
file: msg.filename,
|
|
112812
113018
|
url: msg.url,
|
|
@@ -112823,7 +113029,7 @@ var Ruff = class extends BaseLinter {
|
|
|
112823
113029
|
}
|
|
112824
113030
|
}
|
|
112825
113031
|
async runLinter(document, token) {
|
|
112826
|
-
const fsPath =
|
|
113032
|
+
const fsPath = import_coc27.Uri.parse(document.uri).fsPath;
|
|
112827
113033
|
const args = ["check", "--output-format", "json", "--exit-zero", "--stdin-filename", fsPath, "-"];
|
|
112828
113034
|
return this.run(args, document, token);
|
|
112829
113035
|
}
|
|
@@ -112832,10 +113038,10 @@ var Ruff = class extends BaseLinter {
|
|
|
112832
113038
|
// src/features/linters/lintingEngine.ts
|
|
112833
113039
|
var PYTHON = { language: "python" };
|
|
112834
113040
|
var lintSeverityToVSSeverity = /* @__PURE__ */ new Map();
|
|
112835
|
-
lintSeverityToVSSeverity.set(1 /* Error */,
|
|
112836
|
-
lintSeverityToVSSeverity.set(0 /* Hint */,
|
|
112837
|
-
lintSeverityToVSSeverity.set(3 /* Information */,
|
|
112838
|
-
lintSeverityToVSSeverity.set(2 /* Warning */,
|
|
113041
|
+
lintSeverityToVSSeverity.set(1 /* Error */, import_coc28.DiagnosticSeverity.Error);
|
|
113042
|
+
lintSeverityToVSSeverity.set(0 /* Hint */, import_coc28.DiagnosticSeverity.Hint);
|
|
113043
|
+
lintSeverityToVSSeverity.set(3 /* Information */, import_coc28.DiagnosticSeverity.Information);
|
|
113044
|
+
lintSeverityToVSSeverity.set(2 /* Warning */, import_coc28.DiagnosticSeverity.Warning);
|
|
112839
113045
|
var DisabledLinter = class {
|
|
112840
113046
|
constructor(configService) {
|
|
112841
113047
|
this.configService = configService;
|
|
@@ -112850,8 +113056,8 @@ var DisabledLinter = class {
|
|
|
112850
113056
|
var LintingEngine = class {
|
|
112851
113057
|
constructor() {
|
|
112852
113058
|
this.pendingLintings = /* @__PURE__ */ new Map();
|
|
112853
|
-
this.outputChannel =
|
|
112854
|
-
this.diagnosticCollection =
|
|
113059
|
+
this.outputChannel = import_coc28.window.createOutputChannel("coc-pyright-linting");
|
|
113060
|
+
this.diagnosticCollection = import_coc28.languages.createDiagnosticCollection("python");
|
|
112855
113061
|
this.configService = PythonSettings.getInstance();
|
|
112856
113062
|
this.linters = [
|
|
112857
113063
|
new LinterInfo(8 /* bandit */, "bandit", this.configService),
|
|
@@ -112877,7 +113083,7 @@ var LintingEngine = class {
|
|
|
112877
113083
|
}
|
|
112878
113084
|
async lintOpenPythonFiles() {
|
|
112879
113085
|
this.diagnosticCollection.clear();
|
|
112880
|
-
const promises =
|
|
113086
|
+
const promises = import_coc28.workspace.textDocuments.map(async (document) => this.lintDocument(document));
|
|
112881
113087
|
await Promise.all(promises);
|
|
112882
113088
|
return this.diagnosticCollection;
|
|
112883
113089
|
}
|
|
@@ -112886,12 +113092,12 @@ var LintingEngine = class {
|
|
|
112886
113092
|
if (!this.shouldLintDocument(document)) {
|
|
112887
113093
|
return;
|
|
112888
113094
|
}
|
|
112889
|
-
const fsPath =
|
|
113095
|
+
const fsPath = import_coc28.Uri.parse(document.uri).fsPath;
|
|
112890
113096
|
if (this.pendingLintings.has(fsPath)) {
|
|
112891
113097
|
this.pendingLintings.get(fsPath).cancel();
|
|
112892
113098
|
this.pendingLintings.delete(fsPath);
|
|
112893
113099
|
}
|
|
112894
|
-
const cancelToken = new
|
|
113100
|
+
const cancelToken = new import_coc28.CancellationTokenSource();
|
|
112895
113101
|
cancelToken.token.onCancellationRequested(() => {
|
|
112896
113102
|
if (this.pendingLintings.has(fsPath)) {
|
|
112897
113103
|
this.pendingLintings.delete(fsPath);
|
|
@@ -112914,7 +113120,7 @@ var LintingEngine = class {
|
|
|
112914
113120
|
if (cancelToken.token.isCancellationRequested) {
|
|
112915
113121
|
break;
|
|
112916
113122
|
}
|
|
112917
|
-
const doc =
|
|
113123
|
+
const doc = import_coc28.workspace.getDocument(document.uri);
|
|
112918
113124
|
if (doc) {
|
|
112919
113125
|
for (const m of msgs) {
|
|
112920
113126
|
if (doc.getline(m.line - 1).trim().startsWith("%") && (m.code === LinterErrors.pylint.InvalidSyntax || m.code === LinterErrors.prospector.InvalidSyntax || m.code === LinterErrors.flake8.InvalidSyntax)) {
|
|
@@ -112928,22 +113134,22 @@ var LintingEngine = class {
|
|
|
112928
113134
|
this.diagnosticCollection.set(document.uri, diagnostics);
|
|
112929
113135
|
}
|
|
112930
113136
|
createDiagnostics(message, document) {
|
|
112931
|
-
let start =
|
|
113137
|
+
let start = import_coc28.Position.create(message.line > 0 ? message.line - 1 : 0, message.column);
|
|
112932
113138
|
const endLine = message.endLine ?? message.line;
|
|
112933
113139
|
const endColumn = message.endColumn ?? message.column + 1;
|
|
112934
|
-
let end =
|
|
113140
|
+
let end = import_coc28.Position.create(endLine > 0 ? endLine - 1 : 0, endColumn);
|
|
112935
113141
|
const ms = /['"](.*?)['"]/g.exec(message.message);
|
|
112936
113142
|
if (ms && ms.length > 0) {
|
|
112937
|
-
const line =
|
|
113143
|
+
const line = import_coc28.workspace.getDocument(document.uri).getline(message.line - 1);
|
|
112938
113144
|
if (line.includes(ms[1])) {
|
|
112939
113145
|
const s = message.column > line.indexOf(ms[1]) ? message.column : line.indexOf(ms[1]);
|
|
112940
|
-
start =
|
|
112941
|
-
end =
|
|
113146
|
+
start = import_coc28.Position.create(message.line - 1, s);
|
|
113147
|
+
end = import_coc28.Position.create(message.line - 1, s + ms[1].length);
|
|
112942
113148
|
}
|
|
112943
113149
|
}
|
|
112944
|
-
const range =
|
|
113150
|
+
const range = import_coc28.Range.create(start, end);
|
|
112945
113151
|
const severity = lintSeverityToVSSeverity.get(message.severity);
|
|
112946
|
-
const diagnostic =
|
|
113152
|
+
const diagnostic = import_coc28.Diagnostic.create(range, message.message, severity);
|
|
112947
113153
|
diagnostic.code = message.code;
|
|
112948
113154
|
if (message.url) {
|
|
112949
113155
|
diagnostic.codeDescription = { href: message.url };
|
|
@@ -112962,13 +113168,13 @@ var LintingEngine = class {
|
|
|
112962
113168
|
if (document.languageId !== PYTHON.language) {
|
|
112963
113169
|
return false;
|
|
112964
113170
|
}
|
|
112965
|
-
const fsPath =
|
|
113171
|
+
const fsPath = import_coc28.Uri.parse(document.uri).fsPath;
|
|
112966
113172
|
if (settings.stdLibs.some((p) => fsPath.startsWith(p))) {
|
|
112967
113173
|
return false;
|
|
112968
113174
|
}
|
|
112969
|
-
const relativeFileName = import_path5.default.relative(
|
|
113175
|
+
const relativeFileName = import_path5.default.relative(import_coc28.workspace.root, fsPath);
|
|
112970
113176
|
const ignoreMinmatches = settings.linting.ignorePatterns.map((pattern) => new import_minimatch.Minimatch(pattern, { dot: true }));
|
|
112971
|
-
if (ignoreMinmatches.some((matcher) => matcher.match(
|
|
113177
|
+
if (ignoreMinmatches.some((matcher) => matcher.match(import_coc28.Uri.parse(document.uri).fsPath) || matcher.match(relativeFileName))) {
|
|
112972
113178
|
this.outputChannel.appendLine(`${"#".repeat(5)} linting is ignored by python.linting.ignorePatterns`);
|
|
112973
113179
|
return false;
|
|
112974
113180
|
}
|
|
@@ -113034,13 +113240,13 @@ var LinterProvider = class {
|
|
|
113034
113240
|
this.disposables = [];
|
|
113035
113241
|
this.engine = new LintingEngine();
|
|
113036
113242
|
this.pythonSettings = PythonSettings.getInstance();
|
|
113037
|
-
|
|
113038
|
-
|
|
113039
|
-
|
|
113040
|
-
|
|
113041
|
-
const disposable =
|
|
113243
|
+
import_coc29.workspace.onDidOpenTextDocument((e) => this.onDocumentOpened(e), this.context.subscriptions);
|
|
113244
|
+
import_coc29.workspace.onDidCloseTextDocument((e) => this.onDocumentClosed(e), this.context.subscriptions);
|
|
113245
|
+
import_coc29.workspace.onDidSaveTextDocument((e) => this.onDocumentSaved(e), this.context.subscriptions);
|
|
113246
|
+
import_coc29.workspace.onDidChangeTextDocument((e) => this.onDocumentChanged(e), this.context.subscriptions);
|
|
113247
|
+
const disposable = import_coc29.workspace.onDidChangeConfiguration(this.lintSettingsChangedHandler.bind(this));
|
|
113042
113248
|
this.disposables.push(disposable);
|
|
113043
|
-
this.disposables.push(
|
|
113249
|
+
this.disposables.push(import_coc29.commands.registerCommand("python.runLinting", this.runLinting.bind(this)));
|
|
113044
113250
|
setTimeout(() => this.engine.lintOpenPythonFiles().catch(this.emptyFn), 1200);
|
|
113045
113251
|
}
|
|
113046
113252
|
dispose() {
|
|
@@ -113050,7 +113256,7 @@ var LinterProvider = class {
|
|
|
113050
113256
|
return this.engine.lintOpenPythonFiles();
|
|
113051
113257
|
}
|
|
113052
113258
|
lintSettingsChangedHandler(e) {
|
|
113053
|
-
|
|
113259
|
+
import_coc29.workspace.textDocuments.forEach((document) => {
|
|
113054
113260
|
if (e.affectsConfiguration("python.linting", document.uri)) {
|
|
113055
113261
|
this.engine.lintDocument(document).catch(() => {
|
|
113056
113262
|
});
|
|
@@ -113068,12 +113274,12 @@ var LinterProvider = class {
|
|
|
113068
113274
|
}
|
|
113069
113275
|
}
|
|
113070
113276
|
onDocumentChanged(e) {
|
|
113071
|
-
const document =
|
|
113277
|
+
const document = import_coc29.workspace.getDocument(e.textDocument.uri);
|
|
113072
113278
|
this.engine.lintDocument(document.textDocument, true).catch(() => {
|
|
113073
113279
|
});
|
|
113074
113280
|
}
|
|
113075
113281
|
onDocumentClosed(document) {
|
|
113076
|
-
if (!document || !
|
|
113282
|
+
if (!document || !import_coc29.Uri.parse(document.uri).fsPath || !document.uri) {
|
|
113077
113283
|
return;
|
|
113078
113284
|
}
|
|
113079
113285
|
this.engine.clearDiagnostics(document);
|
|
@@ -113083,7 +113289,7 @@ var LinterProvider = class {
|
|
|
113083
113289
|
};
|
|
113084
113290
|
|
|
113085
113291
|
// src/features/refactor.ts
|
|
113086
|
-
var
|
|
113292
|
+
var import_coc30 = require("coc.nvim");
|
|
113087
113293
|
var path11 = __toESM(require("path"));
|
|
113088
113294
|
var import_fs7 = __toESM(require("fs"));
|
|
113089
113295
|
var RefactorProxy = class {
|
|
@@ -113112,7 +113318,7 @@ var RefactorProxy = class {
|
|
|
113112
113318
|
return offset - winEols;
|
|
113113
113319
|
}
|
|
113114
113320
|
async addImport(document, filePath, name, parent) {
|
|
113115
|
-
const options = await
|
|
113321
|
+
const options = await import_coc30.workspace.getFormatOptions();
|
|
113116
113322
|
const command = {
|
|
113117
113323
|
lookup: "add_import",
|
|
113118
113324
|
id: "1",
|
|
@@ -113125,7 +113331,7 @@ var RefactorProxy = class {
|
|
|
113125
113331
|
return await this.sendCommand(JSON.stringify(command));
|
|
113126
113332
|
}
|
|
113127
113333
|
async extractVariable(document, name, filePath, range) {
|
|
113128
|
-
const options = await
|
|
113334
|
+
const options = await import_coc30.workspace.getFormatOptions();
|
|
113129
113335
|
const command = {
|
|
113130
113336
|
lookup: "extract_variable",
|
|
113131
113337
|
file: filePath,
|
|
@@ -113138,7 +113344,7 @@ var RefactorProxy = class {
|
|
|
113138
113344
|
return await this.sendCommand(JSON.stringify(command));
|
|
113139
113345
|
}
|
|
113140
113346
|
async extractMethod(document, name, filePath, range) {
|
|
113141
|
-
const options = await
|
|
113347
|
+
const options = await import_coc30.workspace.getFormatOptions();
|
|
113142
113348
|
const command = {
|
|
113143
113349
|
lookup: "extract_method",
|
|
113144
113350
|
file: filePath,
|
|
@@ -113233,22 +113439,22 @@ function validateDocumentForRefactor(doc) {
|
|
|
113233
113439
|
return Promise.resolve();
|
|
113234
113440
|
}
|
|
113235
113441
|
return new Promise((resolve, reject) => {
|
|
113236
|
-
|
|
113442
|
+
import_coc30.workspace.nvim.command("write").then(() => {
|
|
113237
113443
|
return resolve();
|
|
113238
113444
|
}, reject);
|
|
113239
113445
|
});
|
|
113240
113446
|
}
|
|
113241
113447
|
async function extractVariable(root, document, range, outputChannel) {
|
|
113242
|
-
const doc = import_coc29.workspace.getDocument(document.uri);
|
|
113243
|
-
const tempFile = await getTempFileWithDocumentContents(document);
|
|
113244
113448
|
const pythonToolsExecutionService = new PythonExecutionService();
|
|
113245
113449
|
const rope = await pythonToolsExecutionService.isModuleInstalled("rope");
|
|
113246
113450
|
if (!rope) {
|
|
113247
|
-
|
|
113451
|
+
import_coc30.window.showWarningMessage(`Module rope not installed`);
|
|
113248
113452
|
return;
|
|
113249
113453
|
}
|
|
113250
|
-
const
|
|
113251
|
-
const
|
|
113454
|
+
const doc = import_coc30.workspace.getDocument(document.uri);
|
|
113455
|
+
const tempFile = await getTempFileWithDocumentContents(document);
|
|
113456
|
+
const workspaceFolder = import_coc30.workspace.getWorkspaceFolder(doc.uri);
|
|
113457
|
+
const workspaceRoot = workspaceFolder ? import_coc30.Uri.parse(workspaceFolder.uri).fsPath : import_coc30.workspace.cwd;
|
|
113252
113458
|
const pythonSettings = PythonSettings.getInstance();
|
|
113253
113459
|
return validateDocumentForRefactor(doc).then(() => {
|
|
113254
113460
|
const newName = `newvariable${(/* @__PURE__ */ new Date()).getMilliseconds().toString()}`;
|
|
@@ -113260,16 +113466,16 @@ async function extractVariable(root, document, range, outputChannel) {
|
|
|
113260
113466
|
});
|
|
113261
113467
|
}
|
|
113262
113468
|
async function extractMethod(root, document, range, outputChannel) {
|
|
113263
|
-
const doc = import_coc29.workspace.getDocument(document.uri);
|
|
113264
|
-
const tempFile = await getTempFileWithDocumentContents(document);
|
|
113265
113469
|
const pythonToolsExecutionService = new PythonExecutionService();
|
|
113266
113470
|
const rope = await pythonToolsExecutionService.isModuleInstalled("rope");
|
|
113267
113471
|
if (!rope) {
|
|
113268
|
-
|
|
113472
|
+
import_coc30.window.showWarningMessage(`Module rope not installed`);
|
|
113269
113473
|
return;
|
|
113270
113474
|
}
|
|
113271
|
-
const
|
|
113272
|
-
const
|
|
113475
|
+
const doc = import_coc30.workspace.getDocument(document.uri);
|
|
113476
|
+
const tempFile = await getTempFileWithDocumentContents(document);
|
|
113477
|
+
const workspaceFolder = import_coc30.workspace.getWorkspaceFolder(doc.uri);
|
|
113478
|
+
const workspaceRoot = workspaceFolder ? import_coc30.Uri.parse(workspaceFolder.uri).fsPath : import_coc30.workspace.cwd;
|
|
113273
113479
|
const pythonSettings = PythonSettings.getInstance();
|
|
113274
113480
|
return validateDocumentForRefactor(doc).then(() => {
|
|
113275
113481
|
const newName = `newmethod${(/* @__PURE__ */ new Date()).getMilliseconds().toString()}`;
|
|
@@ -113281,19 +113487,19 @@ async function extractMethod(root, document, range, outputChannel) {
|
|
|
113281
113487
|
});
|
|
113282
113488
|
}
|
|
113283
113489
|
async function addImport(root, document, name, parent, outputChannel) {
|
|
113284
|
-
const doc = import_coc29.workspace.getDocument(document.uri);
|
|
113285
|
-
const tempFile = await getTempFileWithDocumentContents(document);
|
|
113286
113490
|
const pythonToolsExecutionService = new PythonExecutionService();
|
|
113287
113491
|
const rope = await pythonToolsExecutionService.isModuleInstalled("rope");
|
|
113288
113492
|
if (!rope) {
|
|
113289
|
-
|
|
113493
|
+
import_coc30.window.showWarningMessage(`Module rope not installed`);
|
|
113290
113494
|
return;
|
|
113291
113495
|
}
|
|
113496
|
+
const doc = import_coc30.workspace.getDocument(document.uri);
|
|
113497
|
+
const tempFile = await getTempFileWithDocumentContents(document);
|
|
113292
113498
|
let parentModule = "";
|
|
113293
113499
|
if (parent)
|
|
113294
|
-
parentModule = await
|
|
113295
|
-
const workspaceFolder =
|
|
113296
|
-
const workspaceRoot = workspaceFolder ?
|
|
113500
|
+
parentModule = await import_coc30.window.requestInput("Module:");
|
|
113501
|
+
const workspaceFolder = import_coc30.workspace.getWorkspaceFolder(doc.uri);
|
|
113502
|
+
const workspaceRoot = workspaceFolder ? import_coc30.Uri.parse(workspaceFolder.uri).fsPath : import_coc30.workspace.cwd;
|
|
113297
113503
|
const pythonSettings = PythonSettings.getInstance();
|
|
113298
113504
|
return validateDocumentForRefactor(doc).then(() => {
|
|
113299
113505
|
const proxy = new RefactorProxy(root, pythonSettings, workspaceRoot);
|
|
@@ -113323,7 +113529,7 @@ async function applyImports(doc, resp, outputChannel, tempFile) {
|
|
|
113323
113529
|
outputChannel.appendLine(`Error in add import:
|
|
113324
113530
|
${errorMessage}`);
|
|
113325
113531
|
outputChannel.appendLine("");
|
|
113326
|
-
|
|
113532
|
+
import_coc30.window.showErrorMessage(`Cannot perform addImport using selected element(s).`);
|
|
113327
113533
|
return await Promise.reject(error);
|
|
113328
113534
|
}
|
|
113329
113535
|
}
|
|
@@ -113348,11 +113554,11 @@ async function extractName(textEditor, newName, renameResponse, outputChannel, t
|
|
|
113348
113554
|
const line = textEditor.getline(lineNumber);
|
|
113349
113555
|
const indexOfWord = line.indexOf(newName);
|
|
113350
113556
|
if (indexOfWord >= 0) {
|
|
113351
|
-
newWordPosition =
|
|
113557
|
+
newWordPosition = import_coc30.Position.create(lineNumber, indexOfWord);
|
|
113352
113558
|
break;
|
|
113353
113559
|
}
|
|
113354
113560
|
}
|
|
113355
|
-
return
|
|
113561
|
+
return import_coc30.workspace.jumpTo(textEditor.uri, newWordPosition).then(() => {
|
|
113356
113562
|
return newWordPosition;
|
|
113357
113563
|
});
|
|
113358
113564
|
}
|
|
@@ -113368,13 +113574,13 @@ async function extractName(textEditor, newName, renameResponse, outputChannel, t
|
|
|
113368
113574
|
outputChannel.appendLine(`Error in refactoring:
|
|
113369
113575
|
${errorMessage}`);
|
|
113370
113576
|
outputChannel.appendLine("");
|
|
113371
|
-
|
|
113577
|
+
import_coc30.window.showErrorMessage(`Cannot perform refactoring using selected element(s).`);
|
|
113372
113578
|
return await Promise.reject(error);
|
|
113373
113579
|
}
|
|
113374
113580
|
}
|
|
113375
113581
|
|
|
113376
113582
|
// src/features/testing.ts
|
|
113377
|
-
var
|
|
113583
|
+
var import_coc31 = require("coc.nvim");
|
|
113378
113584
|
var import_path6 = __toESM(require("path"));
|
|
113379
113585
|
function comparePosition(position, other) {
|
|
113380
113586
|
if (position.line > other.line)
|
|
@@ -113398,12 +113604,12 @@ function rangeInRange(r, range) {
|
|
|
113398
113604
|
}
|
|
113399
113605
|
var TestFrameworkProvider = class {
|
|
113400
113606
|
constructor() {
|
|
113401
|
-
this.framework =
|
|
113607
|
+
this.framework = import_coc31.workspace.getConfiguration("pyright").get("testing.provider", "unittest");
|
|
113402
113608
|
}
|
|
113403
113609
|
async parseDocument(document) {
|
|
113404
|
-
if (
|
|
113610
|
+
if (import_coc31.events.insertMode)
|
|
113405
113611
|
return [];
|
|
113406
|
-
const fileName = import_path6.default.basename(
|
|
113612
|
+
const fileName = import_path6.default.basename(import_coc31.Uri.parse(document.uri).fsPath);
|
|
113407
113613
|
if (document.languageId !== "python" || !fileName.startsWith("test_") && !fileName.endsWith("_test.py")) {
|
|
113408
113614
|
return [];
|
|
113409
113615
|
}
|
|
@@ -113429,10 +113635,10 @@ var TestFrameworkProvider = class {
|
|
|
113429
113635
|
if (item.startOffset && item.endOffset) {
|
|
113430
113636
|
const itemStartPosition = document.positionAt(item.startOffset);
|
|
113431
113637
|
const itemEndPosition = document.positionAt(item.endOffset);
|
|
113432
|
-
if (rangeInRange(range,
|
|
113638
|
+
if (rangeInRange(range, import_coc31.Range.create(itemStartPosition, itemEndPosition))) {
|
|
113433
113639
|
actions.push({
|
|
113434
113640
|
title: `RUN ${item.value} with ${this.framework}`,
|
|
113435
|
-
kind:
|
|
113641
|
+
kind: import_coc31.CodeActionKind.Empty,
|
|
113436
113642
|
command: {
|
|
113437
113643
|
title: `RUN ${item.value} with ${this.framework}`,
|
|
113438
113644
|
command: "pyright.singleTest"
|
|
@@ -113453,7 +113659,7 @@ var TestFrameworkProvider = class {
|
|
|
113453
113659
|
const itemStartPosition = document.positionAt(item.startOffset);
|
|
113454
113660
|
const itemEndPosition = document.positionAt(item.endOffset);
|
|
113455
113661
|
const lens = {
|
|
113456
|
-
range:
|
|
113662
|
+
range: import_coc31.Range.create(itemStartPosition, itemEndPosition),
|
|
113457
113663
|
command: {
|
|
113458
113664
|
title: `>> [RUN ${this.framework}]`,
|
|
113459
113665
|
command: "pyright.singleTest"
|
|
@@ -113464,7 +113670,7 @@ var TestFrameworkProvider = class {
|
|
|
113464
113670
|
}
|
|
113465
113671
|
if (codeLenses.length === 0) {
|
|
113466
113672
|
codeLenses.push({
|
|
113467
|
-
range:
|
|
113673
|
+
range: import_coc31.Range.create(import_coc31.Position.create(0, 0), import_coc31.Position.create(0, 0))
|
|
113468
113674
|
});
|
|
113469
113675
|
}
|
|
113470
113676
|
return codeLenses;
|
|
@@ -113472,7 +113678,7 @@ var TestFrameworkProvider = class {
|
|
|
113472
113678
|
};
|
|
113473
113679
|
|
|
113474
113680
|
// src/middleware.ts
|
|
113475
|
-
var
|
|
113681
|
+
var import_coc32 = require("coc.nvim");
|
|
113476
113682
|
function toJSONObject(obj) {
|
|
113477
113683
|
if (obj) {
|
|
113478
113684
|
if (Array.isArray(obj)) {
|
|
@@ -113493,21 +113699,21 @@ function configuration(params, token, next) {
|
|
|
113493
113699
|
const pythonItem = params.items.find((x) => x.section === "python");
|
|
113494
113700
|
if (pythonItem) {
|
|
113495
113701
|
const custom = () => {
|
|
113496
|
-
const config = toJSONObject(
|
|
113702
|
+
const config = toJSONObject(import_coc32.workspace.getConfiguration(pythonItem.section, pythonItem.scopeUri));
|
|
113497
113703
|
config["pythonPath"] = PythonSettings.getInstance().pythonPath;
|
|
113498
113704
|
const analysis = config["analysis"];
|
|
113499
|
-
analysis["stubPath"] =
|
|
113500
|
-
const inspect =
|
|
113705
|
+
analysis["stubPath"] = import_coc32.workspace.expand(analysis["stubPath"]);
|
|
113706
|
+
const inspect = import_coc32.workspace.getConfiguration("python.analysis").inspect("stubPath");
|
|
113501
113707
|
if (inspect && (inspect.globalValue === void 0 || inspect.workspaceValue === void 0 || inspect.workspaceFolderValue === void 0)) {
|
|
113502
113708
|
delete analysis["stubPath"];
|
|
113503
113709
|
}
|
|
113504
113710
|
const extraPaths = analysis["extraPaths"];
|
|
113505
113711
|
if (extraPaths == null ? void 0 : extraPaths.length) {
|
|
113506
|
-
analysis["extraPaths"] = extraPaths.map((p) =>
|
|
113712
|
+
analysis["extraPaths"] = extraPaths.map((p) => import_coc32.workspace.expand(p));
|
|
113507
113713
|
}
|
|
113508
113714
|
const typeshedPaths = analysis["typeshedPaths"];
|
|
113509
113715
|
if (typeshedPaths == null ? void 0 : typeshedPaths.length) {
|
|
113510
|
-
analysis["typeshedPaths"] = typeshedPaths.map((p) =>
|
|
113716
|
+
analysis["typeshedPaths"] = typeshedPaths.map((p) => import_coc32.workspace.expand(p));
|
|
113511
113717
|
}
|
|
113512
113718
|
config["analysis"] = analysis;
|
|
113513
113719
|
return [config];
|
|
@@ -113517,19 +113723,19 @@ function configuration(params, token, next) {
|
|
|
113517
113723
|
const analysisItem = params.items.find((x) => x.section === "python.analysis");
|
|
113518
113724
|
if (analysisItem) {
|
|
113519
113725
|
const custom = () => {
|
|
113520
|
-
const analysis = toJSONObject(
|
|
113521
|
-
analysis["stubPath"] =
|
|
113522
|
-
const inspect =
|
|
113726
|
+
const analysis = toJSONObject(import_coc32.workspace.getConfiguration(analysisItem.section, analysisItem.scopeUri));
|
|
113727
|
+
analysis["stubPath"] = import_coc32.workspace.expand(analysis["stubPath"]);
|
|
113728
|
+
const inspect = import_coc32.workspace.getConfiguration("python.analysis").inspect("stubPath");
|
|
113523
113729
|
if (inspect && (inspect.globalValue === void 0 || inspect.workspaceValue === void 0 || inspect.workspaceFolderValue === void 0)) {
|
|
113524
113730
|
delete analysis["stubPath"];
|
|
113525
113731
|
}
|
|
113526
113732
|
const extraPaths = analysis["extraPaths"];
|
|
113527
113733
|
if (extraPaths == null ? void 0 : extraPaths.length) {
|
|
113528
|
-
analysis["extraPaths"] = extraPaths.map((p) =>
|
|
113734
|
+
analysis["extraPaths"] = extraPaths.map((p) => import_coc32.workspace.expand(p));
|
|
113529
113735
|
}
|
|
113530
113736
|
const typeshedPaths = analysis["typeshedPaths"];
|
|
113531
113737
|
if (typeshedPaths == null ? void 0 : typeshedPaths.length) {
|
|
113532
|
-
analysis["typeshedPaths"] = typeshedPaths.map((p) =>
|
|
113738
|
+
analysis["typeshedPaths"] = typeshedPaths.map((p) => import_coc32.workspace.expand(p));
|
|
113533
113739
|
}
|
|
113534
113740
|
return [analysis];
|
|
113535
113741
|
};
|
|
@@ -113544,14 +113750,14 @@ async function provideCompletionItem(document, position, context, token, next) {
|
|
|
113544
113750
|
return;
|
|
113545
113751
|
const items = Array.isArray(result) ? result : result.items;
|
|
113546
113752
|
items.map((x) => x.sortText ? x.sortText = x.sortText.toLowerCase() : x.sortText = x.label.toLowerCase());
|
|
113547
|
-
const snippetSupport =
|
|
113753
|
+
const snippetSupport = import_coc32.workspace.getConfiguration("pyright").get("completion.snippetSupport");
|
|
113548
113754
|
if (snippetSupport) {
|
|
113549
113755
|
for (const item of items) {
|
|
113550
113756
|
if ((_a = item.data) == null ? void 0 : _a.funcParensDisabled)
|
|
113551
113757
|
continue;
|
|
113552
|
-
if (item.kind ===
|
|
113758
|
+
if (item.kind === import_coc32.CompletionItemKind.Method || item.kind === import_coc32.CompletionItemKind.Function) {
|
|
113553
113759
|
item.insertText = `${item.label}($1)$0`;
|
|
113554
|
-
item.insertTextFormat =
|
|
113760
|
+
item.insertTextFormat = import_coc32.InsertTextFormat.Snippet;
|
|
113555
113761
|
}
|
|
113556
113762
|
}
|
|
113557
113763
|
}
|
|
@@ -113610,34 +113816,34 @@ var PyrightExtensionFeature = class {
|
|
|
113610
113816
|
}
|
|
113611
113817
|
};
|
|
113612
113818
|
async function activate(context) {
|
|
113613
|
-
const pyrightCfg =
|
|
113819
|
+
const pyrightCfg = import_coc33.workspace.getConfiguration("pyright");
|
|
113614
113820
|
const isEnable = pyrightCfg.get("enable", true);
|
|
113615
113821
|
if (!isEnable)
|
|
113616
113822
|
return;
|
|
113617
|
-
const state =
|
|
113823
|
+
const state = import_coc33.extensions.getExtensionState("coc-python");
|
|
113618
113824
|
if (state.toString() === "activated") {
|
|
113619
|
-
|
|
113825
|
+
import_coc33.window.showWarningMessage(`coc-python is installed and activated, coc-pyright will be disabled`);
|
|
113620
113826
|
return;
|
|
113621
113827
|
}
|
|
113622
113828
|
if ((0, import_semver2.lt)(process.versions.node, "12.0.0")) {
|
|
113623
|
-
|
|
113829
|
+
import_coc33.window.showErrorMessage(`Pyright needs Node.js v12+ to work, your Node.js is ${process.version}.`);
|
|
113624
113830
|
return;
|
|
113625
113831
|
}
|
|
113626
113832
|
let module2 = pyrightCfg.get("server");
|
|
113627
113833
|
if (module2) {
|
|
113628
|
-
module2 = import_which5.default.sync(
|
|
113834
|
+
module2 = import_which5.default.sync(import_coc33.workspace.expand(module2), { nothrow: true }) || module2;
|
|
113629
113835
|
} else {
|
|
113630
113836
|
module2 = (0, import_path7.join)(context.extensionPath, "node_modules", "pyright", "langserver.index.js");
|
|
113631
113837
|
}
|
|
113632
113838
|
if (!(0, import_fs8.existsSync)(module2)) {
|
|
113633
|
-
|
|
113839
|
+
import_coc33.window.showErrorMessage(`Pyright langserver doesn't exist, please reinstall coc-pyright`);
|
|
113634
113840
|
return;
|
|
113635
113841
|
}
|
|
113636
113842
|
const runOptions = { execArgv: [`--max-old-space-size=${defaultHeapSize}`] };
|
|
113637
113843
|
const debugOptions = { execArgv: ["--nolazy", "--inspect=6600", `--max-old-space-size=${defaultHeapSize}`] };
|
|
113638
113844
|
const serverOptions = {
|
|
113639
|
-
run: { module: module2, transport:
|
|
113640
|
-
debug: { module: module2, transport:
|
|
113845
|
+
run: { module: module2, transport: import_coc33.TransportKind.ipc, options: runOptions },
|
|
113846
|
+
debug: { module: module2, transport: import_coc33.TransportKind.ipc, options: debugOptions }
|
|
113641
113847
|
};
|
|
113642
113848
|
const disabledFeatures = [];
|
|
113643
113849
|
if (pyrightCfg.get("disableCompletion")) {
|
|
@@ -113653,9 +113859,9 @@ async function activate(context) {
|
|
|
113653
113859
|
if (disableProgress) {
|
|
113654
113860
|
disabledFeatures.push("progress");
|
|
113655
113861
|
}
|
|
113656
|
-
const outputChannel =
|
|
113862
|
+
const outputChannel = import_coc33.window.createOutputChannel("Pyright");
|
|
113657
113863
|
const pythonSettings = PythonSettings.getInstance();
|
|
113658
|
-
outputChannel.appendLine(`Workspace: ${
|
|
113864
|
+
outputChannel.appendLine(`Workspace: ${import_coc33.workspace.root}`);
|
|
113659
113865
|
outputChannel.appendLine(`Using python from ${pythonSettings.pythonPath}
|
|
113660
113866
|
`);
|
|
113661
113867
|
const clientOptions = {
|
|
@@ -113677,40 +113883,40 @@ async function activate(context) {
|
|
|
113677
113883
|
resolveCompletionItem
|
|
113678
113884
|
}
|
|
113679
113885
|
};
|
|
113680
|
-
const client = new
|
|
113886
|
+
const client = new import_coc33.LanguageClient("pyright", "Pyright Server", serverOptions, clientOptions);
|
|
113681
113887
|
client.registerFeature(new PyrightExtensionFeature());
|
|
113682
|
-
context.subscriptions.push(
|
|
113888
|
+
context.subscriptions.push(import_coc33.services.registLanguageClient(client));
|
|
113683
113889
|
const formatProvider = new PythonFormattingEditProvider();
|
|
113684
|
-
context.subscriptions.push(
|
|
113685
|
-
context.subscriptions.push(
|
|
113890
|
+
context.subscriptions.push(import_coc33.languages.registerDocumentFormatProvider(documentSelector, formatProvider));
|
|
113891
|
+
context.subscriptions.push(import_coc33.languages.registerDocumentRangeFormatProvider(documentSelector, formatProvider));
|
|
113686
113892
|
context.subscriptions.push(new LinterProvider(context));
|
|
113687
113893
|
const codeActionProvider = new PythonCodeActionProvider();
|
|
113688
|
-
context.subscriptions.push(
|
|
113894
|
+
context.subscriptions.push(import_coc33.languages.registerCodeActionProvider(documentSelector, codeActionProvider, "Pyright"));
|
|
113689
113895
|
const importSupport = pyrightCfg.get("completion.importSupport");
|
|
113690
113896
|
if (importSupport) {
|
|
113691
113897
|
const provider = new ImportCompletionProvider();
|
|
113692
|
-
context.subscriptions.push(
|
|
113898
|
+
context.subscriptions.push(import_coc33.languages.registerCompletionItemProvider("python-import", "PY", ["python"], provider, [" "]));
|
|
113693
113899
|
}
|
|
113694
|
-
const inlayHintEnable =
|
|
113695
|
-
if (inlayHintEnable && typeof
|
|
113900
|
+
const inlayHintEnable = import_coc33.workspace.getConfiguration("inlayHint").get("enable", true);
|
|
113901
|
+
if (inlayHintEnable && typeof import_coc33.languages.registerInlayHintsProvider === "function") {
|
|
113696
113902
|
const provider = new TypeInlayHintsProvider(client);
|
|
113697
|
-
context.subscriptions.push(
|
|
113903
|
+
context.subscriptions.push(import_coc33.languages.registerInlayHintsProvider(documentSelector, provider));
|
|
113698
113904
|
}
|
|
113699
|
-
const semanticTokensEnable =
|
|
113700
|
-
if (semanticTokensEnable && typeof
|
|
113905
|
+
const semanticTokensEnable = import_coc33.workspace.getConfiguration("semanticTokens").get("enable", true);
|
|
113906
|
+
if (semanticTokensEnable && typeof import_coc33.languages.registerDocumentSemanticTokensProvider === "function") {
|
|
113701
113907
|
const provider = new PythonSemanticTokensProvider();
|
|
113702
|
-
context.subscriptions.push(
|
|
113908
|
+
context.subscriptions.push(import_coc33.languages.registerDocumentSemanticTokensProvider(documentSelector, provider, provider.legend));
|
|
113703
113909
|
}
|
|
113704
113910
|
const testProvider = new TestFrameworkProvider();
|
|
113705
|
-
context.subscriptions.push(
|
|
113706
|
-
const codeLens =
|
|
113911
|
+
context.subscriptions.push(import_coc33.languages.registerCodeActionProvider(documentSelector, testProvider, "Pyright"));
|
|
113912
|
+
const codeLens = import_coc33.workspace.getConfiguration("codeLens").get("enable", false);
|
|
113707
113913
|
if (codeLens)
|
|
113708
|
-
context.subscriptions.push(
|
|
113914
|
+
context.subscriptions.push(import_coc33.languages.registerCodeLensProvider(documentSelector, testProvider));
|
|
113709
113915
|
const textEditorCommands = ["pyright.organizeimports", "pyright.addoptionalforparam"];
|
|
113710
113916
|
textEditorCommands.forEach((commandName) => {
|
|
113711
113917
|
context.subscriptions.push(
|
|
113712
|
-
|
|
113713
|
-
const doc = await
|
|
113918
|
+
import_coc33.commands.registerCommand(commandName, async (offset) => {
|
|
113919
|
+
const doc = await import_coc33.workspace.document;
|
|
113714
113920
|
const cmd = {
|
|
113715
113921
|
command: commandName,
|
|
113716
113922
|
arguments: [doc.uri.toString(), offset]
|
|
@@ -113720,20 +113926,20 @@ async function activate(context) {
|
|
|
113720
113926
|
);
|
|
113721
113927
|
});
|
|
113722
113928
|
let command = "pyright.restartserver";
|
|
113723
|
-
let disposable =
|
|
113929
|
+
let disposable = import_coc33.commands.registerCommand(command, async () => {
|
|
113724
113930
|
await client.sendRequest(method, { command });
|
|
113725
113931
|
});
|
|
113726
113932
|
context.subscriptions.push(disposable);
|
|
113727
113933
|
command = "pyright.createtypestub";
|
|
113728
|
-
disposable =
|
|
113934
|
+
disposable = import_coc33.commands.registerCommand(command, async (...args) => {
|
|
113729
113935
|
if (!args.length) {
|
|
113730
|
-
|
|
113936
|
+
import_coc33.window.showWarningMessage(`Module name is missing`);
|
|
113731
113937
|
return;
|
|
113732
113938
|
}
|
|
113733
|
-
const doc = await
|
|
113734
|
-
const filePath =
|
|
113939
|
+
const doc = await import_coc33.workspace.document;
|
|
113940
|
+
const filePath = import_coc33.Uri.parse(doc.uri).fsPath;
|
|
113735
113941
|
if (args[args.length - 1] !== filePath) {
|
|
113736
|
-
args.unshift(
|
|
113942
|
+
args.unshift(import_coc33.workspace.root);
|
|
113737
113943
|
args.push(filePath);
|
|
113738
113944
|
}
|
|
113739
113945
|
const cmd = {
|
|
@@ -113743,7 +113949,7 @@ async function activate(context) {
|
|
|
113743
113949
|
await client.sendRequest(method, cmd);
|
|
113744
113950
|
});
|
|
113745
113951
|
context.subscriptions.push(disposable);
|
|
113746
|
-
disposable =
|
|
113952
|
+
disposable = import_coc33.commands.registerCommand(
|
|
113747
113953
|
"python.refactorExtractVariable",
|
|
113748
113954
|
async (document, range) => {
|
|
113749
113955
|
await extractVariable(context.extensionPath, document, range, outputChannel).catch(() => {
|
|
@@ -113753,7 +113959,7 @@ async function activate(context) {
|
|
|
113753
113959
|
true
|
|
113754
113960
|
);
|
|
113755
113961
|
context.subscriptions.push(disposable);
|
|
113756
|
-
disposable =
|
|
113962
|
+
disposable = import_coc33.commands.registerCommand(
|
|
113757
113963
|
"python.refactorExtractMethod",
|
|
113758
113964
|
async (document, range) => {
|
|
113759
113965
|
await extractMethod(context.extensionPath, document, range, outputChannel).catch(() => {
|
|
@@ -113763,7 +113969,7 @@ async function activate(context) {
|
|
|
113763
113969
|
true
|
|
113764
113970
|
);
|
|
113765
113971
|
context.subscriptions.push(disposable);
|
|
113766
|
-
disposable =
|
|
113972
|
+
disposable = import_coc33.commands.registerCommand(
|
|
113767
113973
|
"pyright.addImport",
|
|
113768
113974
|
async (document, name, parent) => {
|
|
113769
113975
|
await addImport(context.extensionPath, document, name, parent, outputChannel).catch(() => {
|
|
@@ -113773,25 +113979,25 @@ async function activate(context) {
|
|
|
113773
113979
|
true
|
|
113774
113980
|
);
|
|
113775
113981
|
context.subscriptions.push(disposable);
|
|
113776
|
-
disposable =
|
|
113982
|
+
disposable = import_coc33.commands.registerCommand("python.sortImports", async () => {
|
|
113777
113983
|
await sortImports(context.extensionPath, outputChannel).catch(() => {
|
|
113778
113984
|
});
|
|
113779
113985
|
});
|
|
113780
113986
|
context.subscriptions.push(disposable);
|
|
113781
|
-
disposable =
|
|
113987
|
+
disposable = import_coc33.commands.registerCommand("pyright.fileTest", async () => {
|
|
113782
113988
|
await runFileTest();
|
|
113783
113989
|
});
|
|
113784
113990
|
context.subscriptions.push(disposable);
|
|
113785
|
-
disposable =
|
|
113991
|
+
disposable = import_coc33.commands.registerCommand("pyright.singleTest", async () => {
|
|
113786
113992
|
await runSingleTest();
|
|
113787
113993
|
});
|
|
113788
113994
|
context.subscriptions.push(disposable);
|
|
113789
|
-
disposable =
|
|
113995
|
+
disposable = import_coc33.commands.registerCommand("pyright.version", () => {
|
|
113790
113996
|
const pyrightJSON = (0, import_path7.join)(context.extensionPath, "node_modules", "pyright", "package.json");
|
|
113791
113997
|
const pyrightPackage = JSON.parse((0, import_fs8.readFileSync)(pyrightJSON, "utf8"));
|
|
113792
113998
|
const cocPyrightJSON = (0, import_path7.join)(context.extensionPath, "package.json");
|
|
113793
113999
|
const cocPyrightPackage = JSON.parse((0, import_fs8.readFileSync)(cocPyrightJSON, "utf8"));
|
|
113794
|
-
|
|
114000
|
+
import_coc33.window.showInformationMessage(`coc-pyright ${cocPyrightPackage.version} with Pyright ${pyrightPackage.version}`);
|
|
113795
114001
|
});
|
|
113796
114002
|
context.subscriptions.push(disposable);
|
|
113797
114003
|
}
|