Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies, glob, and IntelliSense loc strings #12317

Merged
merged 18 commits into from
Jun 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/loc/TranslationsImportExport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pool:
steps:
- task: NodeTool@0
inputs:
versionSpec: '16.x'
versionSpec: '18.x'
displayName: 'Install Node.js'

- task: CmdLine@2
Expand Down
4 changes: 0 additions & 4 deletions Extension/.scripts/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ import { Command, CommandFunction } from '../src/Utility/Process/program';
import { ok } from 'assert';
import { CommentJSONValue, parse, stringify } from 'comment-json';
import { mkdir as md, readFile, rm, writeFile } from 'fs/promises';
import { IOptions, glob as globSync } from 'glob';
import { dirname, resolve } from 'path';
import { chdir, cwd, env } from 'process';
import { setImmediate } from 'timers/promises';
import { promisify } from 'util';
import { filepath } from '../src/Utility/Filesystem/filepath';
import { is } from '../src/Utility/System/guards';
import { verbose } from '../src/Utility/Text/streams';
Expand Down Expand Up @@ -87,8 +85,6 @@ export async function mkdir(filePath: string) {
return fullPath;
}

export const glob: (pattern: string, options?: IOptions) => Promise<string[]> = promisify(globSync);

export async function write(filePath: string, data: Buffer | string) {
await mkdir(dirname(filePath));

Expand Down
3 changes: 2 additions & 1 deletion Extension/.scripts/copyWalkthruMedia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
* ------------------------------------------------------------------------------------------ */

import { watch as watchFiles } from 'fs/promises';
import { glob } from 'glob';
import { filepath } from '../src/Utility/Filesystem/filepath';
import { verbose } from '../src/Utility/Text/streams';
import { $root, glob, mkdir, updateFiles } from './common';
import { $root, mkdir, updateFiles } from './common';

export async function main() {
verbose(`Copying walkthrough media to extension/dist folder`);
Expand Down
1,250 changes: 705 additions & 545 deletions Extension/ThirdPartyNotices.txt

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Extension/bin/messages/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"Výraz lambda static musí mít prázdnou specifikaci zachycení.",
"Jednotka hlavičky EDG IFC",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"pro aktuální jednotku překladu se nepovedlo vytvořit jednotku hlavičky",
"aktuální jednotka překladu používá jednu nebo více funkcí, které se v tuto chvíli nedají zapsat do jednotky hlavičky",
"explicit(bool) je funkcí C++20",
"musí být zadán název modulu pro mapování souboru modulu odkazující na soubor %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"Ein Lambdaausdruck \"static\" muss eine leere Erfassungsspezifikation aufweisen.",
"EDG IFC-Headereinheit",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"für die aktuelle Übersetzungseinheit konnte keine Headereinheit erstellt werden",
"Die aktuelle Übersetzungseinheit verwendet mindestens ein Feature, das derzeit nicht in eine Headereinheit geschrieben werden kann",
"\"explicit(bool)\" ist ein C++20-Feature",
"Für die Moduldateizuordnung, die auf die Datei \"%sq\" verweist, muss ein Modulname angegeben werden."
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"una expresión lambda \"estática\" debe tener una especificación de captura vacía",
"Unidad de encabezado EDG IFC",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"no se pudo crear una unidad de encabezado para la unidad de traducción actual",
"la unidad de traducción actual usa una o varias características que no se pueden escribir actualmente en una unidad de encabezado",
"'explicit(bool)' es una característica de C++20",
"se debe especificar un nombre de módulo para la asignación de archivos de módulo que hace referencia al archivo %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"une expression lambda « static » doit avoir une spécification de capture vide",
"Unité d’en-tête IFC EDG",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"impossible de créer une unité d’en-tête pour l’unité de traduction actuelle",
"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",
"'explicit(bool)' est une fonctionnalité C++20",
"un nom de module doit être spécifié pour la carte de fichiers de module référençant le fichier %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"un'espressione lambda 'static' deve avere una specifica di acquisizione vuota",
"Unità di intestazione IFC EDG",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"Non è possibile creare un'unità di intestazione per l'unità di conversione corrente",
"l'unità di conversione corrente utilizza una o più funzionalità che attualmente non possono essere scritte in un'unità di intestazione",
"'explicit(bool)' è una funzionalità di C++20",
"è necessario specificare un nome modulo per la mappa dei file del modulo che fa riferimento al file %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/ja/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"'static' ラムダ式には空のキャプチャ仕様が必要です",
"EDG IFC ヘッダー ユニット",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"現在の翻訳単位のヘッダー ユニットを作成できませんでした",
"現在の翻訳単位は、現在ヘッダー ユニットに書き込むことができない 1 つ以上の機能を使用します",
"'explicit(bool)' は C++20 機能です",
"ファイル %sq を参照するモジュール ファイル マップにモジュール名を指定する必要があります"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/ko/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"'static' 람다 식에는 빈 캡처 사양이 있어야 합니다.",
"EDG IFC 헤더 단위",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"현재 변환 단위에 대한 헤더 단위를 만들 수 없습니다.",
"현재 변환 단위는 헤더 단위에 현재 쓸 수 없는 하나 이상의 기능을 사용합니다.",
"'explicit(bool)'는 C++20 기능입니다.",
"%sq 파일을 참조하는 모듈 파일 맵에 대한 모듈 이름을 지정해야 합니다."
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/pl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"wyrażenie lambda „statyczne” musi mieć pustą specyfikację przechwytywania",
"Jednostka nagłówka EDG IFC",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"nie można utworzyć jednostki nagłówka dla bieżącej jednostki translacji",
"bieżąca jednostka translacji używa co najmniej jednej funkcji, których obecnie nie można zapisać w jednostce nagłówka",
"„explicit(bool)” jest funkcją języka C++20",
"nazwa modułu musi być określona dla mapy pliku modułu odwołującej się do pliku %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/pt-br/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"uma expressão lambda 'static' deve ter uma especificação de captura vazia",
"Unidade de cabeçalho EDG IFC",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"não foi possível criar uma unidade de cabeçalho para a unidade de tradução atual",
"a unidade de tradução atual usa um ou mais recursos que não podem ser gravados atualmente em uma unidade de cabeçalho",
"'explicit(bool)' é um recurso do C++20",
"um nome de módulo deve ser especificado para o mapa do arquivo de módulo que faz referência ao arquivo %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/ru/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"Лямбда-выражение \"static\" должно содержать пустую спецификацию захвата",
"Единица заголовка EDG IFC",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"не удалось создать единицу заголовка для текущей единицы трансляции",
"текущая единица трансляции использует одну или несколько функций, которые в данный момент невозможно записать в единицу заголовка",
"\"explicit(bool)\" — это функция C++20",
"необходимо указать имя модуля для сопоставления файла модуля, ссылающегося на файл %sq"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/tr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"'static' lambda ifadelerinin yakalama belirtimi boş olmalıdır",
"EDG IFC üst bilgi birimi",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"geçerli çeviri birimi için bir başlık birimi oluşturulamadı",
"mevcut çeviri birimi şu anda bir başlık birimine yazılamayan bir veya daha fazla özellik kullanıyorsa",
"'explicit(bool)' bir C++20 özelliğidir",
"%sq dosyasına başvuran modül dosyası eşlemesi için bir modül adı belirtilmelidir"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/zh-cn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"\"static\" Lambda 表达式必须具有空的捕获规范",
"EDG IFC 标头单元",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"无法为当前翻译单元创建标头单元",
"当前翻译单元使用当前无法写入标头单元的一个或多个功能",
"“explicit(bool)” 是 C++20 功能",
"必须为引用文件 %sq 的模块文件映射指定模块名称"
]
7 changes: 4 additions & 3 deletions Extension/bin/messages/zh-tw/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,8 @@
"'static' Lambda 運算式必須有空白的擷取規格",
"EDG IFC 標頭單位",
"EDG IFC",
"a header unit could not be created for the current translation unit",
"the current translation unit uses one or more features that cannot currently be written to a header unit",
"'explicit(bool)' is a C++20 feature"
"無法為目前的編譯單位建立標頭單位",
"目前的編譯單位使用一或多個目前無法寫入標頭單位的功能",
"'explicit(bool)' 是 C++20 功能",
"必須為參照檔案的模組檔案對應指定模組名稱 %sq"
]
3 changes: 2 additions & 1 deletion Extension/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ gulp.task("translations-import", (done) => {
let id = language.transifexId || language.id;
return gulp.src(path.join(options.location, id, translationProjectName, `${translationExtensionName}.xlf`))
.pipe(nls.prepareJsonFiles())
.pipe(gulp.dest(path.join("./i18n", language.folderName)));
.pipe(gulp.dest(path.join("./i18n", language.folderName)))
.pipe(es.wait()); // This is required or it gives `this.pipeTo.end is not a function`.
}))
.pipe(es.wait(() => {
done();
Expand Down
92 changes: 44 additions & 48 deletions Extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6480,78 +6480,74 @@
"build": "yarn prep:dts && echo [Building TypeScript code] && tsc --build tsconfig.json"
},
"devDependencies": {
"@octokit/rest": "^18.12.0",
"@types/glob": "^7.1.6",
"@octokit/rest": "^20.1.1",
"@types/minimatch": "^3.0.5",
"@types/mkdirp": "^0.5.2",
"@types/mocha": "^10.0.1",
"@types/node": "^18.15.0",
"@types/node-fetch": "^2.6.9",
"@types/plist": "^3.0.2",
"@types/semver": "^7.1.0",
"@types/shell-quote": "^1.7.1",
"@types/tmp": "^0.1.0",
"@types/which": "^1.3.2",
"@types/yauzl": "^2.9.1",
"@types/mocha": "^10.0.6",
"@types/node": "^20.14.2",
"@types/node-fetch": "^2.6.11",
"@types/plist": "^3.0.5",
"@types/semver": "^7.5.8",
"@types/shell-quote": "^1.7.5",
"@types/tmp": "^0.2.6",
"@types/which": "^2.0.2",
"@types/yauzl": "^2.10.3",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"eslint-plugin-header": "^3.1.1",
"@vscode/test-electron": "^2.3.8",
"@vscode/debugadapter": "^1.65.0",
"@vscode/debugprotocol": "^1.65.0",
"@vscode/dts": "^0.4.0",
"@vscode/test-electron": "^2.3.10",
"async-child-process": "^1.1.1",
"await-notify": "^1.0.1",
"eslint": "^8.45.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsdoc": "^46.4.4",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.2.8",
"event-stream": "^4.0.1",
"fs-extra": "^8.1.0",
"gulp": "^4.0.2",
"fs-extra": "^11.2.0",
"gulp": "^5.0.0",
"gulp-env": "^0.4.0",
"gulp-filter": "^6.0.0",
"gulp-sourcemaps": "^2.6.5",
"gulp-filter": "^7.0.0",
"gulp-sourcemaps": "^3.0.0",
"gulp-typescript": "^5.0.1",
"minimist": "^1.2.7",
"mocha": "^10.2.0",
"minimist": "^1.2.8",
"mocha": "^10.4.0",
"parse-git-config": "^3.0.0",
"parse5": "^5.1.0",
"parse5": "^7.1.2",
"parse5-traverse": "^1.0.3",
"ts-loader": "^8.1.0",
"ts-node": "10.9.1",
"typescript": "^5.1.3",
"@vscode/debugadapter": "^1.61.0",
"@vscode/debugprotocol": "^1.61.0",
"vscode-nls-dev": "^4.0.0-next.1",
"webpack": "^5.86.0",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"vscode-nls-dev": "^4.0.4",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4",
"xml2js": "^0.5.0"
"xml2js": "^0.6.2"
},
"dependencies": {
"@vscode/extension-telemetry": "^0.6.2",
"chokidar": "^3.5.3",
"comment-json": "^4.1.1",
"editorconfig": "^0.15.3",
"chokidar": "^3.6.0",
"comment-json": "^4.2.3",
"editorconfig": "^2.0.0",
"escape-string-regexp": "^2.0.0",
"glob": "^7.1.6",
"glob": "^10.4.1",
"minimatch": "^3.0.5",
"mkdirp": "^0.5.5",
"node-fetch": "^2.6.9",
"mkdirp": "^3.0.1",
"node-fetch": "^2.7.0",
"node-loader": "^2.0.0",
"node-stream-zip": "^1.15.0",
"plist": "^3.0.5",
"plist": "^3.1.0",
"posix-getopt": "^1.2.1",
"shell-quote": "^1.7.3",
"ssh-config": "^4.1.0",
"tmp": "^0.2.1",
"shell-quote": "^1.8.1",
"ssh-config": "^4.4.4",
"tmp": "^0.2.3",
"vscode-cpptools": "^6.1.0",
"vscode-languageclient": "^8.1.0-next.4",
"vscode-nls": "^5.0.0",
"vscode-tas-client": "^0.1.75",
"vscode-languageclient": "^9.0.1",
"vscode-nls": "^5.2.0",
"vscode-tas-client": "^0.1.84",
"which": "^2.0.2"
},
"resolutions": {
"chokidar": "^3.5.3",
"gulp-mocha/mocha/nanoid": "^3.1.20",
"gulp-mocha/mocha/minimatch": "^3.0.5",
"gulp/**/glob-parent": "^5.1.2"
"postcss": "^8.4.31",
"gulp-typescript/**/glob-parent": "^5.1.2"
}
}
9 changes: 3 additions & 6 deletions Extension/src/Debugger/configurationProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@

import * as jsonc from 'comment-json';
import * as fs from 'fs';
import * as glob from 'glob';
import { glob } from 'glob';
import * as os from 'os';
import * as path from 'path';
import { promisify } from 'util';
import * as vscode from 'vscode';
import * as nls from 'vscode-nls';
import * as util from '../common';
Expand Down Expand Up @@ -39,8 +38,6 @@ enum StepType {
command = 'command'
}

const globAsync: (pattern: string, options?: glob.IOptions | undefined) => Promise<string[]> = promisify(glob);

/*
* Retrieves configurations from a provider and displays them in a quickpick menu to be selected.
* Ensures that the selected configuration's preLaunchTask (if existent) is populated in the user's task.json.
Expand Down Expand Up @@ -1052,10 +1049,10 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
const jumpHosts: util.ISshHostInfo[] = step.host.jumpHosts;
let files: vscode.Uri[] = [];
if (util.isString(step.files)) {
files = files.concat((await globAsync(step.files)).map(file => vscode.Uri.file(file)));
files = files.concat((await glob(step.files)).map(file => vscode.Uri.file(file)));
} else if (util.isArrayOfString(step.files)) {
for (const fileGlob of (step.files as string[])) {
files = files.concat((await globAsync(fileGlob)).map(file => vscode.Uri.file(file)));
files = files.concat((await glob(fileGlob)).map(file => vscode.Uri.file(file)));
}
} else {
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'));
Expand Down
2 changes: 1 addition & 1 deletion Extension/src/LanguageServer/codeAnalysis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ export function publishCodeAnalysisDiagnostics(params: PublishCodeAnalysisDiagno
docPage = `checks${checksGroup}/${checksPage}.html`;
}
// TODO: This should be checking the clang-tidy version used to better support usage of older versions.
const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/18.1.1/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/18.1.6/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
diagnostic.code = { value: identifier.code, target: primaryDocUri };

if (new CppSettings().clangTidyCodeActionShowDocumentation) {
Expand Down
Loading
Loading