Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-30 05:21:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopt protocol.d.ts file from npm package

Browse Source
This commit is contained in:
Dirk Baeumer
2016-10-13 23:49:48 +02:00
parent 67af291986
commit 99dd5e4a22
9 changed files with 1775 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/typescript/src/features/documentSymbolProvider.ts
View File

@@ -8,7 +8,6 @@
import { DocumentSymbolProvider, SymbolInformation, SymbolKind, TextDocument, Range, Location, CancellationToken } from 'vscode';
import * as Proto from '../protocol';
import * as ProtoAdd from '../protocolAdditions';
import * as PConst from '../protocol.const';
import { ITypescriptServiceClient } from '../typescriptService';
@@ -66,7 +65,7 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
}
}
function convertNavTree(bucket: SymbolInformation[], item: ProtoAdd.NavigationTree, containerLabel?: string): void {
function convertNavTree(bucket: SymbolInformation[], item: Proto.NavigationTree, containerLabel?: string): void {
let result = new SymbolInformation(item.text,
outlineTypeTable[item.kind] || SymbolKind.Variable,
containerLabel,

6
extensions/typescript/src/features/formattingProvider.ts
View File

@@ -63,7 +63,7 @@ export default class TypeScriptFormattingProvider implements DocumentRangeFormat
private client: ITypescriptServiceClient;
private config: Configuration;
private formatOptions: { [key: string]: Proto.FormatOptions; };
private formatOptions: { [key: string]: Proto.FormatCodeSettings; };
public constructor(client: ITypescriptServiceClient) {
this.client = client;
@@ -80,7 +80,7 @@ export default class TypeScriptFormattingProvider implements DocumentRangeFormat
}
}
private ensureFormatOptions(document: TextDocument, options: FormattingOptions, token: CancellationToken): Promise<Proto.FormatOptions> {
private ensureFormatOptions(document: TextDocument, options: FormattingOptions, token: CancellationToken): Promise<Proto.FormatCodeSettings> {
let key = document.uri.toString();
let currentOptions = this.formatOptions[key];
if (currentOptions && currentOptions.tabSize === options.tabSize && currentOptions.indentSize === options.tabSize && currentOptions.convertTabsToSpaces === options.insertSpaces) {
@@ -161,7 +161,7 @@ export default class TypeScriptFormattingProvider implements DocumentRangeFormat
edit.newText);
}
private getFormatOptions(options: FormattingOptions): Proto.FormatOptions {
private getFormatOptions(options: FormattingOptions): Proto.FormatCodeSettings {
return {
tabSize: options.tabSize,
indentSize: options.tabSize,

1315
extensions/typescript/src/protocol.d.ts vendored
View File

File diff suppressed because it is too large Load Diff

1760
extensions/typescript/src/protocol.ts Normal file
View File

File diff suppressed because it is too large Load Diff

306
extensions/typescript/src/protocolAdditions.ts
View File

@@ -1,306 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Request, Response, FileRequest, TextSpan } from './protocol';
export namespace CommandTypes {
export type Brace = 'brace';
/* @internal */
export type BraceFull = 'brace-full';
export type BraceCompletion = 'braceCompletion';
export type Change = 'change';
export type Close = 'close';
export type Completions = 'completions';
/* @internal */
export type CompletionsFull = 'completions-full';
export type CompletionDetails = 'completionEntryDetails';
export type CompileOnSaveAffectedFileList = 'compileOnSaveAffectedFileList';
export type CompileOnSaveEmitFile = 'compileOnSaveEmitFile';
export type Configure = 'configure';
export type Definition = 'definition';
/* @internal */
export type DefinitionFull = 'definition-full';
export type Exit = 'exit';
export type Format = 'format';
export type Formatonkey = 'formatonkey';
/* @internal */
export type FormatFull = 'format-full';
/* @internal */
export type FormatonkeyFull = 'formatonkey-full';
/* @internal */
export type FormatRangeFull = 'formatRange-full';
export type Geterr = 'geterr';
export type GeterrForProject = 'geterrForProject';
export type SemanticDiagnosticsSync = 'semanticDiagnosticsSync';
export type SyntacticDiagnosticsSync = 'syntacticDiagnosticsSync';
export type NavBar = 'navbar';
/* @internal */
export type NavBarFull = 'navbar-full';
export type Navto = 'navto';
/* @internal */
export type NavtoFull = 'navto-full';
export type NavTree = 'navtree';
export type NavTreeFull = 'navtree-full';
export type Occurrences = 'occurrences';
export type DocumentHighlights = 'documentHighlights';
/* @internal */
export type DocumentHighlightsFull = 'documentHighlights-full';
export type Open = 'open';
export type Quickinfo = 'quickinfo';
/* @internal */
export type QuickinfoFull = 'quickinfo-full';
export type References = 'references';
/* @internal */
export type ReferencesFull = 'references-full';
export type Reload = 'reload';
export type Rename = 'rename';
/* @internal */
export type RenameInfoFull = 'rename-full';
/* @internal */
export type RenameLocationsFull = 'renameLocations-full';
export type Saveto = 'saveto';
export type SignatureHelp = 'signatureHelp';
/* @internal */
export type SignatureHelpFull = 'signatureHelp-full';
export type TypeDefinition = 'typeDefinition';
export type ProjectInfo = 'projectInfo';
export type ReloadProjects = 'reloadProjects';
export type Unknown = 'unknown';
export type OpenExternalProject = 'openExternalProject';
export type OpenExternalProjects = 'openExternalProjects';
export type CloseExternalProject = 'closeExternalProject';
/* @internal */
export type SynchronizeProjectList = 'synchronizeProjectList';
/* @internal */
export type ApplyChangedToOpenFiles = 'applyChangedToOpenFiles';
/* @internal */
export type EncodedSemanticClassificationsFull = 'encodedSemanticClassifications-full';
/* @internal */
export type Cleanup = 'cleanup';
/* @internal */
export type OutliningSpans = 'outliningSpans';
export type TodoComments = 'todoComments';
export type Indentation = 'indentation';
export type DocCommentTemplate = 'docCommentTemplate';
/* @internal */
export type CompilerOptionsDiagnosticsFull = 'compilerOptionsDiagnostics-full';
/* @internal */
export type NameOrDottedNameSpan = 'nameOrDottedNameSpan';
/* @internal */
export type BreakpointStatement = 'breakpointStatement';
export type CompilerOptionsForInferredProjects = 'compilerOptionsForInferredProjects';
}
/**
* For external projects, some of the project settings are sent together with
* compiler settings.
*/
export interface ExternalProjectCompilerOptions extends CompilerOptions {
/**
* If compile on save is enabled for the project
*/
compileOnSave?: boolean;
}
/**
* Request to set compiler options for inferred projects.
* External projects are opened / closed explicitly.
* Configured projects are opened when user opens loose file that has 'tsconfig.json' or 'jsconfig.json' anywhere in one of containing folders.
* This configuration file will be used to obtain a list of files and configuration settings for the project.
* Inferred projects are created when user opens a loose file that is not the part of external project
* or configured project and will contain only open file and transitive closure of referenced files if 'useOneInferredProject' is false,
* or all open loose files and its transitive closure of referenced files if 'useOneInferredProject' is true.
*/
export interface SetCompilerOptionsForInferredProjectsRequest extends Request {
command: CommandTypes.CompilerOptionsForInferredProjects;
arguments: SetCompilerOptionsForInferredProjectsArgs;
}
/**
* Argument for SetCompilerOptionsForInferredProjectsRequest request.
*/
export interface SetCompilerOptionsForInferredProjectsArgs {
/**
* Compiler options to be used with inferred projects.
*/
options: ExternalProjectCompilerOptions;
}
/**
* Response to SetCompilerOptionsForInferredProjectsResponse request. This is just an acknowledgement, so
* no body field is required.
*/
export interface SetCompilerOptionsForInferredProjectsResponse extends Response {
}
/**
* NavTree request; value of command field is "navtree".
* Return response giving the navigation tree of the requested file.
*/
export interface NavTreeRequest extends FileRequest {
command: CommandTypes.NavTree;
}
/** protocol.NavigationTree is identical to ts.NavigationTree, except using protocol.TextSpan instead of ts.TextSpan */
export interface NavigationTree {
text: string;
kind: string;
kindModifiers: string;
spans: TextSpan[];
childItems?: NavigationTree[];
}
export interface NavTreeResponse extends Response {
body?: NavigationTree;
}
// Additional types copied form the services interfaces
export interface TodoCommentDescriptor {
text: string;
priority: number;
}
export enum ScriptKind {
Unknown = 0,
JS = 1,
JSX = 2,
TS = 3,
TSX = 4
}
export interface TypingOptions {
enableAutoDiscovery?: boolean;
include?: string[];
exclude?: string[];
[option: string]: string[] | boolean | undefined;
}
export enum JsxEmit {
None = 0,
Preserve = 1,
React = 2
}
export enum ModuleKind {
None = 0,
CommonJS = 1,
AMD = 2,
UMD = 3,
System = 4,
ES6 = 5,
ES2015 = ES6,
}
export enum ModuleResolutionKind {
Classic = 1,
NodeJs = 2
}
export enum NewLineKind {
CarriageReturnLineFeed = 0,
LineFeed = 1,
}
export interface MapLike<T> {
[index: string]: T;
}
export type PathSubstitutions = MapLike<string[]>;
export type RootPaths = string[];
export enum ScriptTarget {
ES3 = 0,
ES5 = 1,
ES6 = 2,
ES2015 = ES6,
Latest = ES6,
}
export type TsConfigOnlyOptions = RootPaths | PathSubstitutions;
export type CompilerOptionsValue = string | number | boolean | (string | number)[] | TsConfigOnlyOptions;
export interface CompilerOptions {
allowJs?: boolean;
allowSyntheticDefaultImports?: boolean;
allowUnreachableCode?: boolean;
allowUnusedLabels?: boolean;
baseUrl?: string;
charset?: string;
declaration?: boolean;
declarationDir?: string;
disableSizeLimit?: boolean;
emitBOM?: boolean;
emitDecoratorMetadata?: boolean;
experimentalDecorators?: boolean;
forceConsistentCasingInFileNames?: boolean;
inlineSourceMap?: boolean;
inlineSources?: boolean;
isolatedModules?: boolean;
jsx?: JsxEmit;
lib?: string[];
locale?: string;
mapRoot?: string;
maxNodeModuleJsDepth?: number;
module?: ModuleKind;
moduleResolution?: ModuleResolutionKind;
newLine?: NewLineKind;
noEmit?: boolean;
noEmitHelpers?: boolean;
noEmitOnError?: boolean;
noErrorTruncation?: boolean;
noFallthroughCasesInSwitch?: boolean;
noImplicitAny?: boolean;
noImplicitReturns?: boolean;
noImplicitThis?: boolean;
noUnusedLocals?: boolean;
noUnusedParameters?: boolean;
noImplicitUseStrict?: boolean;
noLib?: boolean;
noResolve?: boolean;
out?: string;
outDir?: string;
outFile?: string;
paths?: PathSubstitutions;
preserveConstEnums?: boolean;
project?: string;
reactNamespace?: string;
removeComments?: boolean;
rootDir?: string;
rootDirs?: RootPaths;
skipLibCheck?: boolean;
skipDefaultLibCheck?: boolean;
sourceMap?: boolean;
sourceRoot?: string;
strictNullChecks?: boolean;
suppressExcessPropertyErrors?: boolean;
suppressImplicitAnyIndexErrors?: boolean;
target?: ScriptTarget;
traceResolution?: boolean;
types?: string[];
/** Paths used to used to compute primary types search locations */
typeRoots?: string[];
[option: string]: CompilerOptionsValue | undefined;
}
export class TextChange {
span: PTextSpan;
newText: string;
}
export interface PTextSpan {
start: number;
length: number;
}
export interface ProjectVersionInfo {
projectName: string;
isInferred: boolean;
version: number;
options: CompilerOptions;
}

4
extensions/typescript/src/typescriptMain.ts
View File

@@ -20,8 +20,6 @@ import * as path from 'path';
import * as Proto from './protocol';
import * as Is from './utils/is';
import TypeScriptServiceClient from './typescriptServiceClient';
import { ITypescriptServiceClientHost } from './typescriptService';
@@ -349,9 +347,11 @@ class TypeScriptServiceClientHost implements ITypescriptServiceClientHost {
language.semanticDiagnosticsReceived(body.file, this.createMarkerDatas(body.diagnostics, language.diagnosticSource));
}
}
/*
if (Is.defined(body.queueLength)) {
BuildStatus.update({ queueLength: body.queueLength });
}
*/
}
/* internal */ configFileDiagnosticsReceived(event: Proto.ConfigFileDiagnosticEvent): void {

5
extensions/typescript/src/typescriptService.ts
View File

@@ -7,7 +7,6 @@
import { CancellationToken, Uri } from 'vscode';
import * as Proto from './protocol';
import * as ProtoAdd from './protocolAdditions';
import * as semver from 'semver';
export interface ITypescriptServiceClientHost {
@@ -81,8 +80,8 @@ export interface ITypescriptServiceClient {
execute(command: 'projectInfo', args: Proto.ProjectInfoRequestArgs, token?: CancellationToken): Promise<Proto.ProjectInfoResponse>;
execute(command: 'reloadProjects', args: any, expectedResult: boolean, token?: CancellationToken): Promise<any>;
execute(command: 'reload', args: Proto.ReloadRequestArgs, expectedResult: boolean, token?: CancellationToken): Promise<any>;
execute(command: 'compilerOptionsForInferredProjects', args: ProtoAdd.SetCompilerOptionsForInferredProjectsArgs, token?: CancellationToken): Promise<any>;
execute(command: 'navtree', args: Proto.FileRequestArgs, token?: CancellationToken): Promise<ProtoAdd.NavTreeResponse>;
execute(command: 'compilerOptionsForInferredProjects', args: Proto.SetCompilerOptionsForInferredProjectsArgs, token?: CancellationToken): Promise<any>;
execute(command: 'navtree', args: Proto.FileRequestArgs, token?: CancellationToken): Promise<Proto.NavTreeResponse>;
// execute(command: 'compileOnSaveAffectedFileList', args: Proto.CompileOnSaveEmitFileRequestArgs, token?: CancellationToken): Promise<Proto.CompileOnSaveAffectedFileListResponse>;
// execute(command: 'compileOnSaveEmitFile', args: Proto.CompileOnSaveEmitFileRequestArgs, token?: CancellationToken): Promise<any>;
execute(command: string, args: any, expectedResult: boolean | CancellationToken, token?: CancellationToken): Promise<any>;

13
extensions/typescript/src/typescriptServiceClient.ts
View File

@@ -14,7 +14,6 @@ import { Reader } from './utils/wireProtocol';
import { workspace, window, Uri, CancellationToken, OutputChannel, Memento, MessageItem } from 'vscode';
import * as Proto from './protocol';
import * as ProtoAdd from './protocolAdditions';
import { ITypescriptServiceClient, ITypescriptServiceClientHost, API } from './typescriptService';
import * as VersionStatus from './utils/versionStatus';
@@ -506,18 +505,18 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
fs.mkdirSync(this.storagePath);
} catch (error) {
}
configureOptions.autoDiagnostics = true;
configureOptions.metaDataDirectory = this.storagePath;
// configureOptions.autoDiagnostics = true;
// configureOptions.metaDataDirectory = this.storagePath;
}
this.execute('configure', configureOptions);
if (this.apiVersion.has206Features()) {
let compilerOptions: ProtoAdd.ExternalProjectCompilerOptions = {
module: ProtoAdd.ModuleKind.CommonJS,
target: ProtoAdd.ScriptTarget.ES6,
let compilerOptions: Proto.ExternalProjectCompilerOptions = {
module: Proto.ModuleKind.CommonJS,
target: Proto.ScriptTarget.ES6,
allowSyntheticDefaultImports: true,
allowJs: true,
};
let args: ProtoAdd.SetCompilerOptionsForInferredProjectsArgs = {
let args: Proto.SetCompilerOptionsForInferredProjectsArgs = {
options: compilerOptions
};
this.execute('compilerOptionsForInferredProjects', args).then(null, (err) => {