github
/
omnisharp-vscode
зеркало из https://github.com/github/omnisharp-vscode.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix errors introduced with TypeScript 2.4

This commit is contained in:
Dustin Campbell 2017-06-27 10:32:14 -07:00
Родитель 58c234ddd3
Коммит b44c362308
2 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/features/status.ts
Просмотреть файл

@ -135,7 +135,7 @@ export function reportDocumentStatus(server: OmniSharpServer): vscode.Disposable
SourceFiles: string[];
}
let fileNames: vscode.DocumentSelector[] = [];
let fileNames: vscode.DocumentFilter[] = [];
let label: string;
function addProjectFileNames(project: Project) {

20
test/assets.test.ts
Просмотреть файл

@ -40,7 +40,7 @@ suite("Asset generation: project.json", () => {
let rootPath = path.resolve('testRoot');
let info = createDotNetWorkspaceInformation(rootPath, 'testApp.dll', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@ -52,7 +52,7 @@ suite("Asset generation: project.json", () => {
let rootPath = path.resolve('testRoot');
let info = createDotNetWorkspaceInformation(path.join(rootPath, 'nested'), 'testApp.dll', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@ -64,7 +64,7 @@ suite("Asset generation: project.json", () => {
let rootPath = path.resolve('testRoot');
let info = createDotNetWorkspaceInformation(rootPath, 'testApp.dll', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@ -76,7 +76,7 @@ suite("Asset generation: project.json", () => {
let rootPath = path.resolve('testRoot');
let info = createDotNetWorkspaceInformation(path.join(rootPath, 'nested'), 'testApp.dll', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@ -85,7 +85,7 @@ suite("Asset generation: project.json", () => {
});
});
function createDotNetWorkspaceInformation(projectPath: string, compilationOutputAssemblyFile: string, targetFrameworkShortName: string, emitEntryPoint: boolean = true) : protocol.WorkspaceInformationResponse {
function createDotNetWorkspaceInformation(projectPath: string, compilationOutputAssemblyFile: string, targetFrameworkShortName: string, emitEntryPoint: boolean = true): protocol.WorkspaceInformationResponse {
return {
DotNet: {
Projects: [
@ -148,7 +148,7 @@ suite("Asset generation: csproj", () => {
let rootPath = path.resolve('testRoot');
let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@ -160,7 +160,7 @@ suite("Asset generation: csproj", () => {
let rootPath = path.resolve('testRoot');
let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'nested', 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@ -172,7 +172,7 @@ suite("Asset generation: csproj", () => {
let rootPath = path.resolve('testRoot');
let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@ -184,7 +184,7 @@ suite("Asset generation: csproj", () => {
let rootPath = path.resolve('testRoot');
let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'nested', 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
let generator = new AssetGenerator(info, rootPath);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, { disallowComments: true });
let programPath = launchJson[0].program;
// ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@ -193,7 +193,7 @@ suite("Asset generation: csproj", () => {
});
});
function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: string, targetFrameworkShortName: string, isExe: boolean = true) : protocol.WorkspaceInformationResponse {
function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: string, targetFrameworkShortName: string, isExe: boolean = true): protocol.WorkspaceInformationResponse {
return {
MsBuild: {
SolutionPath: '',