Skip to content

Commit d6c537e

Browse files
committed
TEMP STUFF - TODO MARKERS ETC
1 parent 6245b00 commit d6c537e

File tree

8 files changed

+12423
-1929
lines changed

8 files changed

+12423
-1929
lines changed

Gulpfile.js

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const cmdLineOptions = require("./scripts/build/options");
1919

2020
const copyright = "CopyrightNotice.txt";
2121
const testRoot = "built/local/testRunner/Harness.js";
22+
//!!! const testRoot = "built/local/run.js";
2223
const cleanTasks = [];
2324

2425
const buildScripts = () => buildProject("scripts");
@@ -126,6 +127,7 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno
126127
const preBuild = cmdLineOptions.lkg ? lkgPreBuild : localPreBuild;
127128

128129
const buildServices = (() => {
130+
return cb => { console.log("!!!TODO!!! buildServices"); cb(); };
129131
// build typescriptServices.out.js
130132
const buildTypescriptServicesOut = () => buildProject("src/typescriptServices/tsconfig.json", cmdLineOptions);
131133

@@ -250,6 +252,7 @@ task("watch-min").flags = {
250252
};
251253

252254
const buildLssl = (() => {
255+
return cb => { console.log("!!!TODO!!! buildLssl"); cb(); };
253256
// build tsserverlibrary.out.js
254257
const buildServerLibraryOut = () => buildProject("src/tsserverlibrary/tsconfig.json", cmdLineOptions);
255258

package-lock.json

+12,410-1,922
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"convert-source-map": "latest",
6666
"del": "5.1.0",
6767
"diff": "^4.0.2",
68+
"esbuild": "^0.13.8",
6869
"eslint": "7.12.1",
6970
"eslint-formatter-autolinkable-stylish": "1.1.4",
7071
"eslint-plugin-import": "2.22.1",

scripts/bisect-test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//!!! should this be updated or removed?
2+
13
/**
24
* You should have ts-node installed globally before executing this, probably!
35
* Otherwise you'll need to compile this script before you start bisecting!

src/compiler/sys.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ export let sys: System = (() => {
12481248
}
12491249
},
12501250
getExecutingFilePath() {
1251-
return __filename;
1251+
return __filename; //!!!
12521252
},
12531253
getCurrentDirectory,
12541254
getDirectories,

src/harness/virtualFileSystemWithWatch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const safeList = {
2929
})
3030
};
3131

32-
function getExecutingFilePathFromLibFile(): string {
32+
function getExecutingFilePathFromLibFile(): string { //!!!
3333
return combinePaths(getDirectoryPath(libFile.path), "tsc.js");
3434
}
3535

src/server/project.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1493,8 +1493,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
14931493
// Search any globally-specified probe paths, then our peer node_modules
14941494
const searchPaths = [
14951495
...this.projectService.pluginProbeLocations,
1496-
// ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/
1497-
combinePaths(this.projectService.getExecutingFilePath(), "../../.."),
1496+
// ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/ //!!!
1497+
combinePaths(this.projectService.getExecutingFilePath(), "../../.."), //!!!
14981498
];
14991499

15001500
if (this.projectService.globalPlugins) {
@@ -2171,8 +2171,8 @@ export class ConfiguredProject extends Project {
21712171
}
21722172

21732173
// Search our peer node_modules, then any globally-specified probe paths
2174-
// ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/
2175-
const searchPaths = [combinePaths(this.projectService.getExecutingFilePath(), "../../.."), ...this.projectService.pluginProbeLocations];
2174+
// ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/ //!!!
2175+
const searchPaths = [combinePaths(this.projectService.getExecutingFilePath(), "../../.."), ...this.projectService.pluginProbeLocations]; //!!!
21762176

21772177
if (this.projectService.allowLocalPluginLoads) {
21782178
const local = getDirectoryPath(this.canonicalConfigFilePath);

tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function filePath(fullPath: string) {
3737
return path.join("/") + "/";
3838
}
3939

40-
var typescriptServiceFileName = filePath(IO.getExecutingFilePath()) + "typescriptServices.js";
40+
var typescriptServiceFileName = filePath(IO.getExecutingFilePath()) + "typescriptServices.js"; //!!!
4141
var typescriptServiceFile = IO.readFile(typescriptServiceFileName);
4242
if (typeof ActiveXObject === "function") {
4343
eval(typescriptServiceFile);

0 commit comments

Comments
 (0)