mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-17 01:25:36 -05:00
* log when an editor action doesn't run because of enablement * notebooks create/dispose editors. this means controllers must be created eagerly (😢) and that notebooks need a custom way of plugging comparision keys for session. works unless creating another session for the same cell of a duplicated editor * Set offSide to sql lang configuration to true (#183461) * Fixes #181764 (#183550) * fix typo * Always scroll down and focus the input (#183557) * Fixes #180386 (#183561) * cli: ensure ordering of rpc server messages (#183558) * cli: ensure ordering of rpc server messages Sending lots of messages to a stream would block them around the async tokio mutex, which is "fair" so doesn't preserve ordering. Instead, use the write_loop approach I introduced to the server_multiplexer for the same reason some time ago. * fix clippy * update for May endgame * testing: allow invalidateTestResults to take an array (#183569) * Document `ShareProvider` API proposal (#183568) * Document `ShareProvider` API proposal * Remove mention of VS Code from JSDoc * Add support for rendering svg and md in welcome message (#183580) * Remove toggle setting more eagerly (#183584) * rm message abt macOS * Change text (#183589) * Change text * Accidentally changed the wrong file * cli: improve output for code tunnel status (#183571) * testing: allow invalidateTestResults to take an array * cli: improve output for code tunnel status Fixes #183570 * [json/css/html] update services (#183595) * Add experimental setting to enable this dialog * Fix exporting chat model to JSON before it is initialized (#183597) * minimum scrolling to reveal the next cell on shift+enter (#183600) do minimum scrolling to reveal the next cell on Execute cell and select next * Fixing Jupyter notebook issue 13263 (#183527) fix for the issue, still need to understand why there is strange focusing * Tweak proposed API JSDoc (#183590) * Tweak proposed API JSDoc * workbench -> workspace * fix ? operator * Use active editor and show progress when sharing (#183603) Use active editor and show progress * use scroll setting variable correctly * Schedule welcome widget to show once between typing. (#183606) * Schedule dialog to show once between typing * Don't re-render if already displayed once * Add F10 keybinding for debugger step, even on Web. (#183510) Fixes #181792. Previously, for Web the keyboard shortcut was Alt-F10, because it was believed that F10 could not be bound on browsers. This turned out to be incorrect, so we make the shortcut consistent (F10) with desktop VSCode which is also what many other debuggers use. We keep Alt-F10 on web as a secondary keybinding to keep the experience some web users may have gotten used to by now. * Also pass process.env * Restore missing chat clear commands (#183651) * chore: update electron@22.5.4 (#183716) * Show remote indicator in web when remoteAuthority is set (#183728) * feat: .vuerc as json file (#153017) Co-authored-by: Martin Aeschlimann <martinae@microsoft.com> * Delete --compatibility=1.63 code from the server (#183738) * Copy vscode.dev link to tunnel generates an invalid link when an untitled workspace is open (#183739) * Recent devcontainer display string corrupted on Get Started page (#183740) * Improve "next codeblock" navigation (#183744) * Improve "next codeblock" navigation Operate on the current focused response, or the last one, and scroll to the selected item * Normalize command title * Git - run git status if similarityThreshold changes (#183762) * fix aria-label issue in kb editor fixes A11y_GradeB_VSCode_Keyboard shortcut reads words together - Blind: Arrow key navigation to row Find the binding keys and "when" cell data are read together resulting in a word " CTRL + FeditorFocus instead of CTRL + F editorFocus" #182490 * Status - fix compact padding (#183768) * Remove angle brackets from VB brackets (#183782) Fixes #183359 * Update language config schema with more details about brackets. (#183779) * fix comment (#183812) * Support for `Notebook` CodeAction Kind (#183457) * nb kind support -- wip * allow notebook codeactions around single cell edit check * move notebook code action type out of editor --------- Co-authored-by: rebornix <penn.lv@gmail.com> * cli: fix connection default being applied (#183827) * cli: bump to openssl 1.1.1u (#183828) * Implement "delete" action for chat history (#183609) * Use desired file name when generating new md pasted file paths (#183861) Fixes #183851 * Default to filename for markdown new file if empty (#183864) Fixes #183848 * Fix small typo (#183865) Fixes #183819 * Noop when moving a symbol into the file it is already in (#183866) Fixes #183793 * Adjust codeAction validation to account for notebook kind (#183859) * Make JS/TS `go to configuration` commands work on non-`file:` file systems (#183688) Make `go to project` commands work on non-`file:` file systems Fixes #183685 * Can't do regex search after opening notebook (#183884) Fixes #183858 * Default to current dir for `move to file` select (#183875) Fixes #183870 `showOpenDialog` seems to ignore `defaultUri` if the file doesn't exist * Use `<...>` style markdown links when needed (#183876) Fixes #183849 * Remove check for context keys * Update xterm package * Enable updating a chat model without triggering incremental typing (#183894) * Enable chat "move" commands on empty sessions (#183895) * Enable chat "move" commands on empty sessions and also imported sessions * Fix command name * Fix some chat keybindings on windows (#183896) * "Revert File" on inactive editors are ignored (fix #177557) (#183903) * Empty reason while switching profile (fix #183775) (#183904) * fix https://github.com/microsoft/vscode-internalbacklog/issues/4278 (#183910) * fix https://github.com/microsoft/vscode/issues/183770 (#183914) * code --status displays a lot of errors before actual status output (fix #183787) (#183915) * joh/icy manatee (#183917) * Use idle value for widget of interactive editor controller https://github.com/microsoft/vscode/issues/183820 * also make preview editors idle values https://github.com/microsoft/vscode/issues/183820 * Fix #183777 (#183929) * Fix #182309 (#183925) * Tree checkbox item -> items (#183931) Fixes #183826 * Fixes #183909 (#183940) * Fix #183837 (#183943) fix #183837 * Git - fix #183941 (#183944) * Update xterm.css Fixes #181242 * chore: add @ulugbekna and @aiday-mar to my-endgame notebook (#183946) * Revert "When snippet mode is active, make `Tab` not accept suggestion but advance placeholder" This reverts commit 50a80cdb61511343996ff1d41d0b676c3d329f48. * revert not focusing completion list when quick suggest happens during snippet * change `snippetsPreventQuickSuggestions` default to false * Fix #181446 (#183956) * fix https://github.com/microsoft/vscode-internalbacklog/issues/4298 (#183957) * fix: remove extraneous incorrect context keys (#183959) These were actually getting added in getTestItemContextOverlay, and the test ID was using the extended ID which extensions do not know about. Fixes #183612 * Fixes https://github.com/microsoft/monaco-editor/issues/3920 (#183960) * fix https://github.com/microsoft/vscode-internalbacklog/issues/4324 (#183961) * fix #183030 * fix #180826 (#183962) * make message more generic for interactive editor help * . * fix #183968 * Keep codeblock toolbar visible when focused * Fix when clause on "Run in terminal" command * add important info to help menu * fix #183970 * Set `isRefactoring` for all TS refactoring edits (#183982) * consolidate * Disable move to file in TS versions < 5.2 (#183992) There are still a few key bugs with refactoring. We will ship this as a preview for TS 5.2+ instead of for 5.1 * Polish query accepting (#183995) We shouldn't send the same request to Copilot if the query hasn't changed. So if the query is the same, we short circut. Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4286 Also, when we open in chat, we should use the last accepted query, not what's in the input box. Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4280 * Allow widget to have focus (#184000) So that selecting non-code text works. Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4294 * Fix microsoft/vscode-internalbacklog#4257. Mitigate zindex for zone widgets. (#184001) * Change welcome dialog contribution to Eventually * Misc fixes * Workspace folder picker entry descriptions are suboptimal for some filesystems (fix #183418) (#184018) * cli - ignore std error unless verbose (#183787) (#184031) * joh/inquisitive meerkat (#184034) * only stash sessions that are none empty https://github.com/microsoft/vscode-internalbacklog/issues/4281 * only unstash a session once - unless new exchanges are made, https://github.com/microsoft/vscode-internalbacklog/issues/4281 * account for all exchange types * Improve declared components (#184039) * make sure to read setting (#184040) d'oh, related to https://github.com/microsoft/vscode/issues/173387#issuecomment-1571696644 * [html] update service (#184049) [html] update service. FIxes #181176 * reset context keys on reset/hide (#184042) fixes https://github.com/microsoft/vscode-internalbacklog/issues/4330 * use `Lazy`, not `IdleValue` for the IE widget held by the eager controller (#184048) https://github.com/microsoft/vscode/issues/183820 * fix https://github.com/microsoft/vscode-internalbacklog/issues/4333 (#184067) * use undo-loop instead of undo-edit when discarding chat session (#184063) * use undo-loop instead of undo-edit when discarding chat session fixes https://github.com/microsoft/vscode-internalbacklog/issues/4118 * fix tests, wait for correct state * Add logging to node download (#184070) Add logging to node download. For #182951 * re-enable default zone widget revealing when showing (#184072) fixes https://github.com/microsoft/vscode-internalbacklog/issues/4332, also fixes https://github.com/microsoft/vscode-internalbacklog/issues/3784 * fix #178202 * Allow APIs in stable (#184062) * Fix microsoft/vscode-internalbacklog#4206. Override List view whitespace css for monaco editor (#184087) * Fix JSDoc grammatical error (#184090) * Pick up TS 5.1.3 (#184091) Fixes #182931 * Misc fixes * update distro (#184097) * chore: update electron@22.5.5 (#184116) * Extension host veto is registered multiple times on restart (fix #183778) (#184127) Extension host veto is registered multiple times on restart (#183778) * Do not auto start the local web worker extension host (#184137) * Allow embedders to intercept trustedTypes.createPolicy calls (#184136) Allow embedders to intercept trustedTypes.createPolicy calls (#184100) * fix: reading from console output for --status on windows and linux (#184138) fix: reading from console output for --status on windows and linux (#184118) * Misc fixes * code --status displays a lot of errors before actual status output (fix #183787) (#184200) fix 183787 * (cherry-pick to 1.79 from main) Handle galleryExtension failure in featuredExtensionService (#184205) Handle galleryExtension failure in featuredExtensionService (#184198) Handle galleryExtension failure * Fix #184183. Multiple output height updates are skipped. (#184188) * Post merge init fixes * Misc build issues * disable toggle inline diff of `alt` down https://github.com/microsoft/vscode-internalbacklog/issues/4342 * Take into account already activated extensions when computing running locations (#184303) Take into account already activated extensions when computing running locations (fixes #184180) * Avoid `extensionService.getExtension` and use `ActivationKind.Immediate` to allow that URI handling works while resolving (#184310) Avoid `extensionService.getExtension` and use `ActivationKind.Immediate` to allow that URI handling works while resolving (fixes #182217) * WIP * rm fish auto injection * More breaks * Fix Port Attributes constructor (#184412) * WIP * WIP * Allow extensions to get at the exports of other extensions during resolving (#184487) Allow extensions to get at the exports of other extensions during resolving (fixes #184472) * do not auto finish session when inline chat widgets have focus re https://github.com/microsoft/vscode-internalbacklog/issues/4354 * fix compile errors caused by new base method * WIP * WIP * WIP * WIP * Build errors * unc - fix path traversal bypass * Bump version * cherry-pick prod changes from main * Disable sandbox * Build break from merge * bump version * Merge pull request #184739 from max06/max06/issue184659 Restore ShellIntegration for fish (#184659) * Git - only add --find-renames if the value is not the default one (#185053) Git - only add --find-renames if the value is not the default one (#184992) * Cherry-pick: Revert changes to render featured extensions when available (#184747) Revert changes to render featured extensions when available. (#184573) * Lower timeouts for experimentation and gallery service * Revert changes to render extensions when available * Add audio cues * fix: disable app sandbox when --no-sandbox is present (#184913) * fix: disable app sandbox when --no-sandbox is present (#184897) * fix: loading minimist in packaged builds * Runtime errors * UNC allow list checks cannot be disabled in extension host (fix #184989) (#185085) * UNC allow list checks cannot be disabled in extension host (#184989) * Update src/vs/base/node/unc.js Co-authored-by: Robo <hop2deep@gmail.com> --------- Co-authored-by: Robo <hop2deep@gmail.com> * Add notebook extension * Fix mangling issues * Fix mangling issues * npm install * npm install * Issues blocking bundle * Fix build folder compile errors * Fix windows bundle build * Linting fixes * Fix sqllint issues * Update yarn.lock files * Fix unit tests * Fix a couple breaks from test fixes * Bump distro * redo the checkbox style * Update linux build container dockerfile * Bump build image tag * Bump native watch dog package * Bump node-pty * Bump distro * Fix documnetation error * Update distro * redo the button styles * Update datasource TS * Add missing yarn.lock files * Windows setup fix * Turn off extension unit tests while investigating * color box style * Remove appx * Turn off test log upload * update dropdownlist style * fix universal app build error (#23488) * Skip flaky bufferContext vscode test --------- Co-authored-by: Johannes <johannes.rieken@gmail.com> Co-authored-by: Henning Dieterichs <hdieterichs@microsoft.com> Co-authored-by: Julien Richard <jairbubbles@hotmail.com> Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> Co-authored-by: Megan Rogge <merogge@microsoft.com> Co-authored-by: meganrogge <megan.rogge@microsoft.com> Co-authored-by: Rob Lourens <roblourens@gmail.com> Co-authored-by: Connor Peet <connor@peet.io> Co-authored-by: Joyce Er <joyce.er@microsoft.com> Co-authored-by: Bhavya U <bhavyau@microsoft.com> Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Co-authored-by: Martin Aeschlimann <martinae@microsoft.com> Co-authored-by: Aaron Munger <aamunger@microsoft.com> Co-authored-by: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com> Co-authored-by: rebornix <penn.lv@gmail.com> Co-authored-by: Ole <oler@google.com> Co-authored-by: Jean Pierre <jeanp413@hotmail.com> Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com> Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Co-authored-by: Ulugbek Abdullaev <ulugbekna@gmail.com> Co-authored-by: Alex Ross <alros@microsoft.com> Co-authored-by: Michael Lively <milively@microsoft.com> Co-authored-by: Matt Bierner <matb@microsoft.com> Co-authored-by: Andrea Mah <31675041+andreamah@users.noreply.github.com> Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com> Co-authored-by: Sandeep Somavarapu <sasomava@microsoft.com> Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Co-authored-by: Tyler James Leonhardt <me@tylerleonhardt.com> Co-authored-by: Alexandru Dima <alexdima@microsoft.com> Co-authored-by: Joao Moreno <Joao.Moreno@microsoft.com> Co-authored-by: Alan Ren <alanren@microsoft.com>
686 lines
20 KiB
TypeScript
686 lines
20 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
import * as fs from 'fs';
|
|
import * as path from 'path';
|
|
import * as crypto from 'crypto';
|
|
import * as utils from './utils';
|
|
import * as colors from 'ansi-colors';
|
|
import * as ts from 'typescript';
|
|
import * as Vinyl from 'vinyl';
|
|
import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map';
|
|
|
|
export interface IConfiguration {
|
|
logFn: (topic: string, message: string) => void;
|
|
_emitWithoutBasePath?: boolean;
|
|
}
|
|
|
|
export interface CancellationToken {
|
|
isCancellationRequested(): boolean;
|
|
}
|
|
|
|
export namespace CancellationToken {
|
|
export const None: CancellationToken = {
|
|
isCancellationRequested() { return false; }
|
|
};
|
|
}
|
|
|
|
export interface ITypeScriptBuilder {
|
|
build(out: (file: Vinyl) => void, onError: (err: ts.Diagnostic) => void, token?: CancellationToken): Promise<any>;
|
|
file(file: Vinyl): void;
|
|
languageService: ts.LanguageService;
|
|
}
|
|
|
|
function normalize(path: string): string {
|
|
return path.replace(/\\/g, '/');
|
|
}
|
|
|
|
export function createTypeScriptBuilder(config: IConfiguration, projectFile: string, cmd: ts.ParsedCommandLine): ITypeScriptBuilder {
|
|
|
|
const _log = config.logFn;
|
|
|
|
const host = new LanguageServiceHost(cmd, projectFile, _log);
|
|
const service = ts.createLanguageService(host, ts.createDocumentRegistry());
|
|
const lastBuildVersion: { [path: string]: string } = Object.create(null);
|
|
const lastDtsHash: { [path: string]: string } = Object.create(null);
|
|
const userWantsDeclarations = cmd.options.declaration;
|
|
let oldErrors: { [path: string]: ts.Diagnostic[] } = Object.create(null);
|
|
let headUsed = process.memoryUsage().heapUsed;
|
|
let emitSourceMapsInStream = true;
|
|
|
|
// always emit declaraction files
|
|
host.getCompilationSettings().declaration = true;
|
|
|
|
function file(file: Vinyl): void {
|
|
// support gulp-sourcemaps
|
|
if ((<any>file).sourceMap) {
|
|
emitSourceMapsInStream = false;
|
|
}
|
|
|
|
if (!file.contents) {
|
|
host.removeScriptSnapshot(file.path);
|
|
} else {
|
|
host.addScriptSnapshot(file.path, new VinylScriptSnapshot(file));
|
|
}
|
|
}
|
|
|
|
function baseFor(snapshot: ScriptSnapshot): string {
|
|
if (snapshot instanceof VinylScriptSnapshot) {
|
|
return cmd.options.outDir || snapshot.getBase();
|
|
} else {
|
|
return '';
|
|
}
|
|
}
|
|
|
|
function isExternalModule(sourceFile: ts.SourceFile): boolean {
|
|
return (<any>sourceFile).externalModuleIndicator
|
|
|| /declare\s+module\s+('|")(.+)\1/.test(sourceFile.getText());
|
|
}
|
|
|
|
function build(out: (file: Vinyl) => void, onError: (err: any) => void, token = CancellationToken.None): Promise<any> {
|
|
|
|
function checkSyntaxSoon(fileName: string): Promise<ts.Diagnostic[]> {
|
|
return new Promise<ts.Diagnostic[]>(resolve => {
|
|
process.nextTick(function () {
|
|
if (!host.getScriptSnapshot(fileName, false)) {
|
|
resolve([]); // no script, no problems
|
|
} else {
|
|
resolve(service.getSyntacticDiagnostics(fileName));
|
|
}
|
|
});
|
|
});
|
|
}
|
|
|
|
function checkSemanticsSoon(fileName: string): Promise<ts.Diagnostic[]> {
|
|
return new Promise<ts.Diagnostic[]>(resolve => {
|
|
process.nextTick(function () {
|
|
if (!host.getScriptSnapshot(fileName, false)) {
|
|
resolve([]); // no script, no problems
|
|
} else {
|
|
resolve(service.getSemanticDiagnostics(fileName));
|
|
}
|
|
});
|
|
});
|
|
}
|
|
|
|
function emitSoon(fileName: string): Promise<{ fileName: string; signature?: string; files: Vinyl[] }> {
|
|
|
|
return new Promise(resolve => {
|
|
process.nextTick(function () {
|
|
|
|
if (/\.d\.ts$/.test(fileName)) {
|
|
// if it's already a d.ts file just emit it signature
|
|
const snapshot = host.getScriptSnapshot(fileName);
|
|
const signature = crypto.createHash('md5')
|
|
.update(snapshot.getText(0, snapshot.getLength()))
|
|
.digest('base64');
|
|
|
|
return resolve({
|
|
fileName,
|
|
signature,
|
|
files: []
|
|
});
|
|
}
|
|
|
|
const output = service.getEmitOutput(fileName);
|
|
const files: Vinyl[] = [];
|
|
let signature: string | undefined;
|
|
|
|
for (const file of output.outputFiles) {
|
|
if (!emitSourceMapsInStream && /\.js\.map$/.test(file.name)) {
|
|
continue;
|
|
}
|
|
|
|
if (/\.d\.ts$/.test(file.name)) {
|
|
signature = crypto.createHash('md5')
|
|
.update(file.text)
|
|
.digest('base64');
|
|
|
|
if (!userWantsDeclarations) {
|
|
// don't leak .d.ts files if users don't want them
|
|
continue;
|
|
}
|
|
}
|
|
|
|
const vinyl = new Vinyl({
|
|
path: file.name,
|
|
contents: Buffer.from(file.text),
|
|
base: !config._emitWithoutBasePath && baseFor(host.getScriptSnapshot(fileName)) || undefined
|
|
});
|
|
|
|
if (!emitSourceMapsInStream && /\.js$/.test(file.name)) {
|
|
const sourcemapFile = output.outputFiles.filter(f => /\.js\.map$/.test(f.name))[0];
|
|
|
|
if (sourcemapFile) {
|
|
const extname = path.extname(vinyl.relative);
|
|
const basename = path.basename(vinyl.relative, extname);
|
|
const dirname = path.dirname(vinyl.relative);
|
|
const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts';
|
|
|
|
let sourceMap = <RawSourceMap>JSON.parse(sourcemapFile.text);
|
|
sourceMap.sources[0] = tsname.replace(/\\/g, '/');
|
|
|
|
// check for an "input source" map and combine them
|
|
// in step 1 we extract all line edit from the input source map, and
|
|
// in step 2 we apply the line edits to the typescript source map
|
|
const snapshot = host.getScriptSnapshot(fileName);
|
|
if (snapshot instanceof VinylScriptSnapshot && snapshot.sourceMap) {
|
|
const inputSMC = new SourceMapConsumer(snapshot.sourceMap);
|
|
const tsSMC = new SourceMapConsumer(sourceMap);
|
|
let didChange = false;
|
|
const smg = new SourceMapGenerator({
|
|
file: sourceMap.file,
|
|
sourceRoot: sourceMap.sourceRoot
|
|
});
|
|
|
|
// step 1
|
|
const lineEdits = new Map<number, [from: number, to: number][]>();
|
|
inputSMC.eachMapping(m => {
|
|
if (m.originalLine === m.generatedLine) {
|
|
// same line mapping
|
|
let array = lineEdits.get(m.originalLine);
|
|
if (!array) {
|
|
array = [];
|
|
lineEdits.set(m.originalLine, array);
|
|
}
|
|
array.push([m.originalColumn, m.generatedColumn]);
|
|
} else {
|
|
// NOT SUPPORTED
|
|
}
|
|
});
|
|
|
|
// step 2
|
|
tsSMC.eachMapping(m => {
|
|
didChange = true;
|
|
const edits = lineEdits.get(m.originalLine);
|
|
let originalColumnDelta = 0;
|
|
if (edits) {
|
|
for (const [from, to] of edits) {
|
|
if (to >= m.originalColumn) {
|
|
break;
|
|
}
|
|
originalColumnDelta = from - to;
|
|
}
|
|
}
|
|
smg.addMapping({
|
|
source: m.source,
|
|
name: m.name,
|
|
generated: { line: m.generatedLine, column: m.generatedColumn },
|
|
original: { line: m.originalLine, column: m.originalColumn + originalColumnDelta }
|
|
});
|
|
});
|
|
|
|
if (didChange) {
|
|
|
|
[tsSMC, inputSMC].forEach((consumer) => {
|
|
(<SourceMapConsumer & { sources: string[] }>consumer).sources.forEach((sourceFile: any) => {
|
|
(<any>smg)._sources.add(sourceFile);
|
|
const sourceContent = consumer.sourceContentFor(sourceFile);
|
|
if (sourceContent !== null) {
|
|
smg.setSourceContent(sourceFile, sourceContent);
|
|
}
|
|
});
|
|
});
|
|
|
|
sourceMap = JSON.parse(smg.toString());
|
|
|
|
// const filename = '/Users/jrieken/Code/vscode/src2/' + vinyl.relative + '.map';
|
|
// fs.promises.mkdir(path.dirname(filename), { recursive: true }).then(async () => {
|
|
// await fs.promises.writeFile(filename, smg.toString());
|
|
// await fs.promises.writeFile('/Users/jrieken/Code/vscode/src2/' + vinyl.relative, vinyl.contents);
|
|
// });
|
|
}
|
|
}
|
|
|
|
(<any>vinyl).sourceMap = sourceMap;
|
|
}
|
|
}
|
|
|
|
files.push(vinyl);
|
|
}
|
|
|
|
resolve({
|
|
fileName,
|
|
signature,
|
|
files
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
const newErrors: { [path: string]: ts.Diagnostic[] } = Object.create(null);
|
|
const t1 = Date.now();
|
|
|
|
const toBeEmitted: string[] = [];
|
|
const toBeCheckedSyntactically: string[] = [];
|
|
const toBeCheckedSemantically: string[] = [];
|
|
const filesWithChangedSignature: string[] = [];
|
|
const dependentFiles: string[] = [];
|
|
const newLastBuildVersion = new Map<string, string>();
|
|
|
|
for (const fileName of host.getScriptFileNames()) {
|
|
if (lastBuildVersion[fileName] !== host.getScriptVersion(fileName)) {
|
|
|
|
toBeEmitted.push(fileName);
|
|
toBeCheckedSyntactically.push(fileName);
|
|
toBeCheckedSemantically.push(fileName);
|
|
}
|
|
}
|
|
|
|
return new Promise<void>(resolve => {
|
|
|
|
const semanticCheckInfo = new Map<string, number>();
|
|
const seenAsDependentFile = new Set<string>();
|
|
|
|
function workOnNext() {
|
|
|
|
let promise: Promise<any> | undefined;
|
|
// let fileName: string;
|
|
|
|
// someone told us to stop this
|
|
if (token.isCancellationRequested()) {
|
|
_log('[CANCEL]', '>>This compile run was cancelled<<');
|
|
newLastBuildVersion.clear();
|
|
resolve();
|
|
return;
|
|
}
|
|
|
|
// (1st) emit code
|
|
else if (toBeEmitted.length) {
|
|
const fileName = toBeEmitted.pop()!;
|
|
promise = emitSoon(fileName).then(value => {
|
|
|
|
for (const file of value.files) {
|
|
_log('[emit code]', file.path);
|
|
out(file);
|
|
}
|
|
|
|
// remember when this was build
|
|
newLastBuildVersion.set(fileName, host.getScriptVersion(fileName));
|
|
|
|
// remeber the signature
|
|
if (value.signature && lastDtsHash[fileName] !== value.signature) {
|
|
lastDtsHash[fileName] = value.signature;
|
|
filesWithChangedSignature.push(fileName);
|
|
}
|
|
}).catch(e => {
|
|
// can't just skip this or make a result up..
|
|
host.error(`ERROR emitting ${fileName}`);
|
|
host.error(e);
|
|
});
|
|
}
|
|
|
|
// (2nd) check syntax
|
|
else if (toBeCheckedSyntactically.length) {
|
|
const fileName = toBeCheckedSyntactically.pop()!;
|
|
_log('[check syntax]', fileName);
|
|
promise = checkSyntaxSoon(fileName).then(diagnostics => {
|
|
delete oldErrors[fileName];
|
|
if (diagnostics.length > 0) {
|
|
diagnostics.forEach(d => onError(d));
|
|
newErrors[fileName] = diagnostics;
|
|
|
|
// stop the world when there are syntax errors
|
|
toBeCheckedSyntactically.length = 0;
|
|
toBeCheckedSemantically.length = 0;
|
|
filesWithChangedSignature.length = 0;
|
|
}
|
|
});
|
|
}
|
|
|
|
// (3rd) check semantics
|
|
else if (toBeCheckedSemantically.length) {
|
|
|
|
let fileName = toBeCheckedSemantically.pop();
|
|
while (fileName && semanticCheckInfo.has(fileName)) {
|
|
fileName = toBeCheckedSemantically.pop()!;
|
|
}
|
|
|
|
if (fileName) {
|
|
_log('[check semantics]', fileName);
|
|
promise = checkSemanticsSoon(fileName).then(diagnostics => {
|
|
delete oldErrors[fileName!];
|
|
semanticCheckInfo.set(fileName!, diagnostics.length);
|
|
if (diagnostics.length > 0) {
|
|
diagnostics.forEach(d => onError(d));
|
|
newErrors[fileName!] = diagnostics;
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
// (4th) check dependents
|
|
else if (filesWithChangedSignature.length) {
|
|
while (filesWithChangedSignature.length) {
|
|
const fileName = filesWithChangedSignature.pop()!;
|
|
|
|
if (!isExternalModule(service.getProgram()!.getSourceFile(fileName)!)) {
|
|
_log('[check semantics*]', fileName + ' is an internal module and it has changed shape -> check whatever hasn\'t been checked yet');
|
|
toBeCheckedSemantically.push(...host.getScriptFileNames());
|
|
filesWithChangedSignature.length = 0;
|
|
dependentFiles.length = 0;
|
|
break;
|
|
}
|
|
|
|
host.collectDependents(fileName, dependentFiles);
|
|
}
|
|
}
|
|
|
|
// (5th) dependents contd
|
|
else if (dependentFiles.length) {
|
|
let fileName = dependentFiles.pop();
|
|
while (fileName && seenAsDependentFile.has(fileName)) {
|
|
fileName = dependentFiles.pop();
|
|
}
|
|
if (fileName) {
|
|
seenAsDependentFile.add(fileName);
|
|
const value = semanticCheckInfo.get(fileName);
|
|
if (value === 0) {
|
|
// already validated successfully -> look at dependents next
|
|
host.collectDependents(fileName, dependentFiles);
|
|
|
|
} else if (typeof value === 'undefined') {
|
|
// first validate -> look at dependents next
|
|
dependentFiles.push(fileName);
|
|
toBeCheckedSemantically.push(fileName);
|
|
}
|
|
}
|
|
}
|
|
|
|
// (last) done
|
|
else {
|
|
resolve();
|
|
return;
|
|
}
|
|
|
|
if (!promise) {
|
|
promise = Promise.resolve();
|
|
}
|
|
|
|
promise.then(function () {
|
|
// change to change
|
|
process.nextTick(workOnNext);
|
|
}).catch(err => {
|
|
console.error(err);
|
|
});
|
|
}
|
|
|
|
workOnNext();
|
|
|
|
}).then(() => {
|
|
// store the build versions to not rebuilt the next time
|
|
newLastBuildVersion.forEach((value, key) => {
|
|
lastBuildVersion[key] = value;
|
|
});
|
|
|
|
// print old errors and keep them
|
|
utils.collections.forEach(oldErrors, entry => {
|
|
entry.value.forEach(diag => onError(diag));
|
|
newErrors[entry.key] = entry.value;
|
|
});
|
|
oldErrors = newErrors;
|
|
|
|
// print stats
|
|
const headNow = process.memoryUsage().heapUsed;
|
|
const MB = 1024 * 1024;
|
|
_log(
|
|
'[tsb]',
|
|
`time: ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem: ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`
|
|
);
|
|
headUsed = headNow;
|
|
});
|
|
}
|
|
|
|
return {
|
|
file,
|
|
build,
|
|
languageService: service
|
|
};
|
|
}
|
|
|
|
class ScriptSnapshot implements ts.IScriptSnapshot {
|
|
|
|
private readonly _text: string;
|
|
private readonly _mtime: Date;
|
|
|
|
constructor(text: string, mtime: Date) {
|
|
this._text = text;
|
|
this._mtime = mtime;
|
|
}
|
|
|
|
getVersion(): string {
|
|
return this._mtime.toUTCString();
|
|
}
|
|
|
|
getText(start: number, end: number): string {
|
|
return this._text.substring(start, end);
|
|
}
|
|
|
|
getLength(): number {
|
|
return this._text.length;
|
|
}
|
|
|
|
getChangeRange(_oldSnapshot: ts.IScriptSnapshot): ts.TextChangeRange | undefined {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
class VinylScriptSnapshot extends ScriptSnapshot {
|
|
|
|
private readonly _base: string;
|
|
|
|
readonly sourceMap?: RawSourceMap;
|
|
|
|
constructor(file: Vinyl & { sourceMap?: RawSourceMap }) {
|
|
super(file.contents!.toString(), file.stat!.mtime);
|
|
this._base = file.base;
|
|
this.sourceMap = file.sourceMap;
|
|
}
|
|
|
|
getBase(): string {
|
|
return this._base;
|
|
}
|
|
}
|
|
|
|
class LanguageServiceHost implements ts.LanguageServiceHost {
|
|
|
|
private readonly _snapshots: { [path: string]: ScriptSnapshot };
|
|
private readonly _filesInProject: Set<string>;
|
|
private readonly _filesAdded: Set<string>;
|
|
private readonly _dependencies: utils.graph.Graph<string>;
|
|
private readonly _dependenciesRecomputeList: string[];
|
|
private readonly _fileNameToDeclaredModule: { [path: string]: string[] };
|
|
|
|
private _projectVersion: number;
|
|
|
|
constructor(
|
|
private readonly _cmdLine: ts.ParsedCommandLine,
|
|
private readonly _projectPath: string,
|
|
private readonly _log: (topic: string, message: string) => void
|
|
) {
|
|
this._snapshots = Object.create(null);
|
|
this._filesInProject = new Set(_cmdLine.fileNames);
|
|
this._filesAdded = new Set();
|
|
this._dependencies = new utils.graph.Graph<string>(s => s);
|
|
this._dependenciesRecomputeList = [];
|
|
this._fileNameToDeclaredModule = Object.create(null);
|
|
|
|
this._projectVersion = 1;
|
|
}
|
|
|
|
log(_s: string): void {
|
|
// console.log(s);
|
|
}
|
|
|
|
trace(_s: string): void {
|
|
// console.log(s);
|
|
}
|
|
|
|
error(s: string): void {
|
|
console.error(s);
|
|
}
|
|
|
|
getCompilationSettings(): ts.CompilerOptions {
|
|
return this._cmdLine.options;
|
|
}
|
|
|
|
getProjectVersion(): string {
|
|
return String(this._projectVersion);
|
|
}
|
|
|
|
getScriptFileNames(): string[] {
|
|
const res = Object.keys(this._snapshots).filter(path => this._filesInProject.has(path) || this._filesAdded.has(path));
|
|
return res;
|
|
}
|
|
|
|
getScriptVersion(filename: string): string {
|
|
filename = normalize(filename);
|
|
const result = this._snapshots[filename];
|
|
if (result) {
|
|
return result.getVersion();
|
|
}
|
|
return 'UNKNWON_FILE_' + Math.random().toString(16).slice(2);
|
|
}
|
|
|
|
getScriptSnapshot(filename: string, resolve: boolean = true): ScriptSnapshot {
|
|
filename = normalize(filename);
|
|
let result = this._snapshots[filename];
|
|
if (!result && resolve) {
|
|
try {
|
|
result = new VinylScriptSnapshot(new Vinyl(<any>{
|
|
path: filename,
|
|
contents: fs.readFileSync(filename),
|
|
base: this.getCompilationSettings().outDir,
|
|
stat: fs.statSync(filename)
|
|
}));
|
|
this.addScriptSnapshot(filename, result);
|
|
} catch (e) {
|
|
// ignore
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _declareModule = /declare\s+module\s+('|")(.+)\1/g;
|
|
|
|
addScriptSnapshot(filename: string, snapshot: ScriptSnapshot): ScriptSnapshot {
|
|
this._projectVersion++;
|
|
filename = normalize(filename);
|
|
const old = this._snapshots[filename];
|
|
if (!old && !this._filesInProject.has(filename) && !filename.endsWith('.d.ts')) {
|
|
// ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
// not very proper!
|
|
this._filesAdded.add(filename);
|
|
}
|
|
if (!old || old.getVersion() !== snapshot.getVersion()) {
|
|
this._dependenciesRecomputeList.push(filename);
|
|
const node = this._dependencies.lookup(filename);
|
|
if (node) {
|
|
node.outgoing = Object.create(null);
|
|
}
|
|
|
|
// (cheap) check for declare module
|
|
LanguageServiceHost._declareModule.lastIndex = 0;
|
|
let match: RegExpExecArray | null | undefined;
|
|
while ((match = LanguageServiceHost._declareModule.exec(snapshot.getText(0, snapshot.getLength())))) {
|
|
let declaredModules = this._fileNameToDeclaredModule[filename];
|
|
if (!declaredModules) {
|
|
this._fileNameToDeclaredModule[filename] = declaredModules = [];
|
|
}
|
|
declaredModules.push(match[2]);
|
|
}
|
|
}
|
|
this._snapshots[filename] = snapshot;
|
|
return old;
|
|
}
|
|
|
|
removeScriptSnapshot(filename: string): boolean {
|
|
this._filesInProject.delete(filename);
|
|
this._filesAdded.delete(filename);
|
|
this._projectVersion++;
|
|
filename = normalize(filename);
|
|
delete this._fileNameToDeclaredModule[filename];
|
|
return delete this._snapshots[filename];
|
|
}
|
|
|
|
getCurrentDirectory(): string {
|
|
return path.dirname(this._projectPath);
|
|
}
|
|
|
|
getDefaultLibFileName(options: ts.CompilerOptions): string {
|
|
return ts.getDefaultLibFilePath(options);
|
|
}
|
|
|
|
readonly directoryExists = ts.sys.directoryExists;
|
|
readonly getDirectories = ts.sys.getDirectories;
|
|
readonly fileExists = ts.sys.fileExists;
|
|
readonly readFile = ts.sys.readFile;
|
|
readonly readDirectory = ts.sys.readDirectory;
|
|
|
|
// ---- dependency management
|
|
|
|
collectDependents(filename: string, target: string[]): void {
|
|
while (this._dependenciesRecomputeList.length) {
|
|
this._processFile(this._dependenciesRecomputeList.pop()!);
|
|
}
|
|
filename = normalize(filename);
|
|
const node = this._dependencies.lookup(filename);
|
|
if (node) {
|
|
utils.collections.forEach(node.incoming, entry => target.push(entry.key));
|
|
}
|
|
}
|
|
|
|
_processFile(filename: string): void {
|
|
if (filename.match(/.*\.d\.ts$/)) {
|
|
return;
|
|
}
|
|
filename = normalize(filename);
|
|
const snapshot = this.getScriptSnapshot(filename);
|
|
if (!snapshot) {
|
|
this._log('processFile', `Missing snapshot for: ${filename}`);
|
|
return;
|
|
}
|
|
const info = ts.preProcessFile(snapshot.getText(0, snapshot.getLength()), true);
|
|
|
|
// (1) ///-references
|
|
info.referencedFiles.forEach(ref => {
|
|
const resolvedPath = path.resolve(path.dirname(filename), ref.fileName);
|
|
const normalizedPath = normalize(resolvedPath);
|
|
|
|
this._dependencies.inertEdge(filename, normalizedPath);
|
|
});
|
|
|
|
// (2) import-require statements
|
|
info.importedFiles.forEach(ref => {
|
|
const stopDirname = normalize(this.getCurrentDirectory());
|
|
let dirname = filename;
|
|
let found = false;
|
|
|
|
while (!found && dirname.indexOf(stopDirname) === 0) {
|
|
dirname = path.dirname(dirname);
|
|
const resolvedPath = path.resolve(dirname, ref.fileName);
|
|
const normalizedPath = normalize(resolvedPath);
|
|
|
|
if (this.getScriptSnapshot(normalizedPath + '.ts')) {
|
|
this._dependencies.inertEdge(filename, normalizedPath + '.ts');
|
|
found = true;
|
|
|
|
} else if (this.getScriptSnapshot(normalizedPath + '.d.ts')) {
|
|
this._dependencies.inertEdge(filename, normalizedPath + '.d.ts');
|
|
found = true;
|
|
}
|
|
}
|
|
|
|
if (!found) {
|
|
for (const key in this._fileNameToDeclaredModule) {
|
|
if (this._fileNameToDeclaredModule[key] && ~this._fileNameToDeclaredModule[key].indexOf(ref.fileName)) {
|
|
this._dependencies.inertEdge(filename, key);
|
|
}
|
|
}
|
|
}
|
|
});
|
|
}
|
|
}
|