Skip to content

Commit 1cfd34c

Browse files
sean-mcmanussean-mcmanus
authored
Update dependencies, glob, and IntelliSense loc strings (#12317)
* Update dependencies * Update TPN. * Update glob. * Update EDG loc strings.
1 parent 923ecfa commit 1cfd34c

24 files changed

+2447
-2830
lines changed

‎Build/loc/TranslationsImportExport.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pool:
2626
steps:
2727
- task: NodeTool@0
2828
inputs:
29-
versionSpec: '16.x'
29+
versionSpec: '18.x'
3030
displayName: 'Install Node.js'
3131

3232
- task: CmdLine@2

‎Extension/.scripts/common.ts

-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ import { Command, CommandFunction } from '../src/Utility/Process/program';
88
import { ok } from 'assert';
99
import { CommentJSONValue, parse, stringify } from 'comment-json';
1010
import { mkdir as md, readFile, rm, writeFile } from 'fs/promises';
11-
import { IOptions, glob as globSync } from 'glob';
1211
import { dirname, resolve } from 'path';
1312
import { chdir, cwd, env } from 'process';
1413
import { setImmediate } from 'timers/promises';
15-
import { promisify } from 'util';
1614
import { filepath } from '../src/Utility/Filesystem/filepath';
1715
import { is } from '../src/Utility/System/guards';
1816
import { verbose } from '../src/Utility/Text/streams';
@@ -87,8 +85,6 @@ export async function mkdir(filePath: string) {
8785
return fullPath;
8886
}
8987

90-
export const glob: (pattern: string, options?: IOptions) => Promise<string[]> = promisify(globSync);
91-
9288
export async function write(filePath: string, data: Buffer | string) {
9389
await mkdir(dirname(filePath));
9490

‎Extension/.scripts/copyWalkthruMedia.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
* ------------------------------------------------------------------------------------------ */
55

66
import { watch as watchFiles } from 'fs/promises';
7+
import { glob } from 'glob';
78
import { filepath } from '../src/Utility/Filesystem/filepath';
89
import { verbose } from '../src/Utility/Text/streams';
9-
import { $root, glob, mkdir, updateFiles } from './common';
10+
import { $root, mkdir, updateFiles } from './common';
1011

1112
export async function main() {
1213
verbose(`Copying walkthrough media to extension/dist folder`);

‎Extension/ThirdPartyNotices.txt

+705-545
Large diffs are not rendered by default.

‎Extension/bin/messages/cs/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"Výraz lambda static musí mít prázdnou specifikaci zachycení.",
35993599
"Jednotka hlavičky EDG IFC",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"pro aktuální jednotku překladu se nepovedlo vytvořit jednotku hlavičky",
3602+
"aktuální jednotka překladu používá jednu nebo více funkcí, které se v tuto chvíli nedají zapsat do jednotky hlavičky",
3603+
"explicit(bool) je funkcí C++20",
3604+
"musí být zadán název modulu pro mapování souboru modulu odkazující na soubor %sq"
36043605
]

‎Extension/bin/messages/de/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"Ein Lambdaausdruck \"static\" muss eine leere Erfassungsspezifikation aufweisen.",
35993599
"EDG IFC-Headereinheit",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"für die aktuelle Übersetzungseinheit konnte keine Headereinheit erstellt werden",
3602+
"Die aktuelle Übersetzungseinheit verwendet mindestens ein Feature, das derzeit nicht in eine Headereinheit geschrieben werden kann",
3603+
"\"explicit(bool)\" ist ein C++20-Feature",
3604+
"Für die Moduldateizuordnung, die auf die Datei \"%sq\" verweist, muss ein Modulname angegeben werden."
36043605
]

‎Extension/bin/messages/es/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"una expresión lambda \"estática\" debe tener una especificación de captura vacía",
35993599
"Unidad de encabezado EDG IFC",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"no se pudo crear una unidad de encabezado para la unidad de traducción actual",
3602+
"la unidad de traducción actual usa una o varias características que no se pueden escribir actualmente en una unidad de encabezado",
3603+
"'explicit(bool)' es una característica de C++20",
3604+
"se debe especificar un nombre de módulo para la asignación de archivos de módulo que hace referencia al archivo %sq"
36043605
]

‎Extension/bin/messages/fr/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"une expression lambda « static » doit avoir une spécification de capture vide",
35993599
"Unité d’en-tête IFC EDG",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"impossible de créer une unité d’en-tête pour l’unité de traduction actuelle",
3602+
"l’unité de traduction actuelle utilise une ou plusieurs fonctionnalités qui ne peuvent actuellement pas être écrites dans une unité d’en-tête",
3603+
"'explicit(bool)' est une fonctionnalité C++20",
3604+
"un nom de module doit être spécifié pour la carte de fichiers de module référençant le fichier %sq"
36043605
]

‎Extension/bin/messages/it/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"un'espressione lambda 'static' deve avere una specifica di acquisizione vuota",
35993599
"Unità di intestazione IFC EDG",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"Non è possibile creare un'unità di intestazione per l'unità di conversione corrente",
3602+
"l'unità di conversione corrente utilizza una o più funzionalità che attualmente non possono essere scritte in un'unità di intestazione",
3603+
"'explicit(bool)' è una funzionalità di C++20",
3604+
"è necessario specificare un nome modulo per la mappa dei file del modulo che fa riferimento al file %sq"
36043605
]

‎Extension/bin/messages/ja/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"'static' ラムダ式には空のキャプチャ仕様が必要です",
35993599
"EDG IFC ヘッダー ユニット",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"現在の翻訳単位のヘッダー ユニットを作成できませんでした",
3602+
"現在の翻訳単位は、現在ヘッダー ユニットに書き込むことができない 1 つ以上の機能を使用します",
3603+
"'explicit(bool)' は C++20 機能です",
3604+
"ファイル %sq を参照するモジュール ファイル マップにモジュール名を指定する必要があります"
36043605
]

‎Extension/bin/messages/ko/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"'static' 람다 식에는 빈 캡처 사양이 있어야 합니다.",
35993599
"EDG IFC 헤더 단위",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"현재 변환 단위에 대한 헤더 단위를 만들 수 없습니다.",
3602+
"현재 변환 단위는 헤더 단위에 현재 쓸 수 없는 하나 이상의 기능을 사용합니다.",
3603+
"'explicit(bool)'는 C++20 기능입니다.",
3604+
"%sq 파일을 참조하는 모듈 파일 맵에 대한 모듈 이름을 지정해야 합니다."
36043605
]

‎Extension/bin/messages/pl/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"wyrażenie lambda „statyczne” musi mieć pustą specyfikację przechwytywania",
35993599
"Jednostka nagłówka EDG IFC",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"nie można utworzyć jednostki nagłówka dla bieżącej jednostki translacji",
3602+
"bieżąca jednostka translacji używa co najmniej jednej funkcji, których obecnie nie można zapisać w jednostce nagłówka",
3603+
"„explicit(bool)” jest funkcją języka C++20",
3604+
"nazwa modułu musi być określona dla mapy pliku modułu odwołującej się do pliku %sq"
36043605
]

‎Extension/bin/messages/pt-br/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"uma expressão lambda 'static' deve ter uma especificação de captura vazia",
35993599
"Unidade de cabeçalho EDG IFC",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"não foi possível criar uma unidade de cabeçalho para a unidade de tradução atual",
3602+
"a unidade de tradução atual usa um ou mais recursos que não podem ser gravados atualmente em uma unidade de cabeçalho",
3603+
"'explicit(bool)' é um recurso do C++20",
3604+
"um nome de módulo deve ser especificado para o mapa do arquivo de módulo que faz referência ao arquivo %sq"
36043605
]

‎Extension/bin/messages/ru/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"Лямбда-выражение \"static\" должно содержать пустую спецификацию захвата",
35993599
"Единица заголовка EDG IFC",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"не удалось создать единицу заголовка для текущей единицы трансляции",
3602+
"текущая единица трансляции использует одну или несколько функций, которые в данный момент невозможно записать в единицу заголовка",
3603+
"\"explicit(bool)\" — это функция C++20",
3604+
"необходимо указать имя модуля для сопоставления файла модуля, ссылающегося на файл %sq"
36043605
]

‎Extension/bin/messages/tr/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"'static' lambda ifadelerinin yakalama belirtimi boş olmalıdır",
35993599
"EDG IFC üst bilgi birimi",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"geçerli çeviri birimi için bir başlık birimi oluşturulamadı",
3602+
"mevcut çeviri birimi şu anda bir başlık birimine yazılamayan bir veya daha fazla özellik kullanıyorsa",
3603+
"'explicit(bool)' bir C++20 özelliğidir",
3604+
"%sq dosyasına başvuran modül dosyası eşlemesi için bir modül adı belirtilmelidir"
36043605
]

‎Extension/bin/messages/zh-cn/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"\"static\" Lambda 表达式必须具有空的捕获规范",
35993599
"EDG IFC 标头单元",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"无法为当前翻译单元创建标头单元",
3602+
"当前翻译单元使用当前无法写入标头单元的一个或多个功能",
3603+
"“explicit(bool)” 是 C++20 功能",
3604+
"必须为引用文件 %sq 的模块文件映射指定模块名称"
36043605
]

‎Extension/bin/messages/zh-tw/messages.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,8 @@
35983598
"'static' Lambda 運算式必須有空白的擷取規格",
35993599
"EDG IFC 標頭單位",
36003600
"EDG IFC",
3601-
"a header unit could not be created for the current translation unit",
3602-
"the current translation unit uses one or more features that cannot currently be written to a header unit",
3603-
"'explicit(bool)' is a C++20 feature"
3601+
"無法為目前的編譯單位建立標頭單位",
3602+
"目前的編譯單位使用一或多個目前無法寫入標頭單位的功能",
3603+
"'explicit(bool)' 是 C++20 功能",
3604+
"必須為參照檔案的模組檔案對應指定模組名稱 %sq"
36043605
]

‎Extension/gulpfile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ gulp.task("translations-import", (done) => {
270270
let id = language.transifexId || language.id;
271271
return gulp.src(path.join(options.location, id, translationProjectName, `${translationExtensionName}.xlf`))
272272
.pipe(nls.prepareJsonFiles())
273-
.pipe(gulp.dest(path.join("./i18n", language.folderName)));
273+
.pipe(gulp.dest(path.join("./i18n", language.folderName)))
274+
.pipe(es.wait()); // This is required or it gives `this.pipeTo.end is not a function`.
274275
}))
275276
.pipe(es.wait(() => {
276277
done();

‎Extension/package.json

+44-48
Original file line numberDiff line numberDiff line change
@@ -6480,78 +6480,74 @@
64806480
"build": "yarn prep:dts && echo [Building TypeScript code] && tsc --build tsconfig.json"
64816481
},
64826482
"devDependencies": {
6483-
"@octokit/rest": "^18.12.0",
6484-
"@types/glob": "^7.1.6",
6483+
"@octokit/rest": "^20.1.1",
64856484
"@types/minimatch": "^3.0.5",
6486-
"@types/mkdirp": "^0.5.2",
6487-
"@types/mocha": "^10.0.1",
6488-
"@types/node": "^18.15.0",
6489-
"@types/node-fetch": "^2.6.9",
6490-
"@types/plist": "^3.0.2",
6491-
"@types/semver": "^7.1.0",
6492-
"@types/shell-quote": "^1.7.1",
6493-
"@types/tmp": "^0.1.0",
6494-
"@types/which": "^1.3.2",
6495-
"@types/yauzl": "^2.9.1",
6485+
"@types/mocha": "^10.0.6",
6486+
"@types/node": "^20.14.2",
6487+
"@types/node-fetch": "^2.6.11",
6488+
"@types/plist": "^3.0.5",
6489+
"@types/semver": "^7.5.8",
6490+
"@types/shell-quote": "^1.7.5",
6491+
"@types/tmp": "^0.2.6",
6492+
"@types/which": "^2.0.2",
6493+
"@types/yauzl": "^2.10.3",
64966494
"@typescript-eslint/eslint-plugin": "^6.1.0",
64976495
"@typescript-eslint/parser": "^6.1.0",
6498-
"eslint-plugin-header": "^3.1.1",
6499-
"@vscode/test-electron": "^2.3.8",
6496+
"@vscode/debugadapter": "^1.65.0",
6497+
"@vscode/debugprotocol": "^1.65.0",
65006498
"@vscode/dts": "^0.4.0",
6499+
"@vscode/test-electron": "^2.3.10",
65016500
"async-child-process": "^1.1.1",
65026501
"await-notify": "^1.0.1",
65036502
"eslint": "^8.45.0",
6504-
"eslint-plugin-import": "^2.27.5",
6505-
"eslint-plugin-jsdoc": "^46.4.4",
6503+
"eslint-plugin-header": "^3.1.1",
6504+
"eslint-plugin-import": "^2.29.1",
6505+
"eslint-plugin-jsdoc": "^48.2.8",
65066506
"event-stream": "^4.0.1",
6507-
"fs-extra": "^8.1.0",
6508-
"gulp": "^4.0.2",
6507+
"fs-extra": "^11.2.0",
6508+
"gulp": "^5.0.0",
65096509
"gulp-env": "^0.4.0",
6510-
"gulp-filter": "^6.0.0",
6511-
"gulp-sourcemaps": "^2.6.5",
6510+
"gulp-filter": "^7.0.0",
6511+
"gulp-sourcemaps": "^3.0.0",
65126512
"gulp-typescript": "^5.0.1",
6513-
"minimist": "^1.2.7",
6514-
"mocha": "^10.2.0",
6513+
"minimist": "^1.2.8",
6514+
"mocha": "^10.4.0",
65156515
"parse-git-config": "^3.0.0",
6516-
"parse5": "^5.1.0",
6516+
"parse5": "^7.1.2",
65176517
"parse5-traverse": "^1.0.3",
6518-
"ts-loader": "^8.1.0",
6519-
"ts-node": "10.9.1",
6520-
"typescript": "^5.1.3",
6521-
"@vscode/debugadapter": "^1.61.0",
6522-
"@vscode/debugprotocol": "^1.61.0",
6523-
"vscode-nls-dev": "^4.0.0-next.1",
6524-
"webpack": "^5.86.0",
6518+
"ts-loader": "^9.5.1",
6519+
"ts-node": "^10.9.2",
6520+
"typescript": "^5.4.5",
6521+
"vscode-nls-dev": "^4.0.4",
6522+
"webpack": "^5.91.0",
65256523
"webpack-cli": "^5.1.4",
6526-
"xml2js": "^0.5.0"
6524+
"xml2js": "^0.6.2"
65276525
},
65286526
"dependencies": {
65296527
"@vscode/extension-telemetry": "^0.6.2",
6530-
"chokidar": "^3.5.3",
6531-
"comment-json": "^4.1.1",
6532-
"editorconfig": "^0.15.3",
6528+
"chokidar": "^3.6.0",
6529+
"comment-json": "^4.2.3",
6530+
"editorconfig": "^2.0.0",
65336531
"escape-string-regexp": "^2.0.0",
6534-
"glob": "^7.1.6",
6532+
"glob": "^10.4.1",
65356533
"minimatch": "^3.0.5",
6536-
"mkdirp": "^0.5.5",
6537-
"node-fetch": "^2.6.9",
6534+
"mkdirp": "^3.0.1",
6535+
"node-fetch": "^2.7.0",
65386536
"node-loader": "^2.0.0",
65396537
"node-stream-zip": "^1.15.0",
6540-
"plist": "^3.0.5",
6538+
"plist": "^3.1.0",
65416539
"posix-getopt": "^1.2.1",
6542-
"shell-quote": "^1.7.3",
6543-
"ssh-config": "^4.1.0",
6544-
"tmp": "^0.2.1",
6540+
"shell-quote": "^1.8.1",
6541+
"ssh-config": "^4.4.4",
6542+
"tmp": "^0.2.3",
65456543
"vscode-cpptools": "^6.1.0",
6546-
"vscode-languageclient": "^8.1.0-next.4",
6547-
"vscode-nls": "^5.0.0",
6548-
"vscode-tas-client": "^0.1.75",
6544+
"vscode-languageclient": "^9.0.1",
6545+
"vscode-nls": "^5.2.0",
6546+
"vscode-tas-client": "^0.1.84",
65496547
"which": "^2.0.2"
65506548
},
65516549
"resolutions": {
6552-
"chokidar": "^3.5.3",
6553-
"gulp-mocha/mocha/nanoid": "^3.1.20",
6554-
"gulp-mocha/mocha/minimatch": "^3.0.5",
6555-
"gulp/**/glob-parent": "^5.1.2"
6550+
"postcss": "^8.4.31",
6551+
"gulp-typescript/**/glob-parent": "^5.1.2"
65566552
}
65576553
}

‎Extension/src/Debugger/configurationProvider.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
import * as jsonc from 'comment-json';
77
import * as fs from 'fs';
8-
import * as glob from 'glob';
8+
import { glob } from 'glob';
99
import * as os from 'os';
1010
import * as path from 'path';
11-
import { promisify } from 'util';
1211
import * as vscode from 'vscode';
1312
import * as nls from 'vscode-nls';
1413
import * as util from '../common';
@@ -39,8 +38,6 @@ enum StepType {
3938
command = 'command'
4039
}
4140

42-
const globAsync: (pattern: string, options?: glob.IOptions | undefined) => Promise<string[]> = promisify(glob);
43-
4441
/*
4542
* Retrieves configurations from a provider and displays them in a quickpick menu to be selected.
4643
* Ensures that the selected configuration's preLaunchTask (if existent) is populated in the user's task.json.
@@ -1052,10 +1049,10 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
10521049
const jumpHosts: util.ISshHostInfo[] = step.host.jumpHosts;
10531050
let files: vscode.Uri[] = [];
10541051
if (util.isString(step.files)) {
1055-
files = files.concat((await globAsync(step.files)).map(file => vscode.Uri.file(file)));
1052+
files = files.concat((await glob(step.files)).map(file => vscode.Uri.file(file)));
10561053
} else if (util.isArrayOfString(step.files)) {
10571054
for (const fileGlob of (step.files as string[])) {
1058-
files = files.concat((await globAsync(fileGlob)).map(file => vscode.Uri.file(file)));
1055+
files = files.concat((await glob(fileGlob)).map(file => vscode.Uri.file(file)));
10591056
}
10601057
} else {
10611058
void logger.getOutputChannelLogger().showErrorMessage(localize('incorrect.files.type.copyFile', '"files" must be a string or an array of strings in {0} steps.', isScp ? 'SCP' : 'rsync'));

‎Extension/src/LanguageServer/codeAnalysis.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ export function publishCodeAnalysisDiagnostics(params: PublishCodeAnalysisDiagno
378378
docPage = `checks${checksGroup}/${checksPage}.html`;
379379
}
380380
// TODO: This should be checking the clang-tidy version used to better support usage of older versions.
381-
const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/18.1.1/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
381+
const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/18.1.6/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
382382
diagnostic.code = { value: identifier.code, target: primaryDocUri };
383383

384384
if (new CppSettings().clangTidyCodeActionShowDocumentation) {

0 commit comments

Comments
 (0)