Skip to content

Commit d47aa98

Browse files
committed
Merge branch 'master' into monodevelop
Conflicts: src/TypeScriptBinding/Hosting/LanguageServiceLogger.cs src/TypeScriptBinding/Hosting/LanguageServiceShimHost.cs src/TypeScriptBinding/TypeScriptBinding.csproj src/TypeScriptBinding/TypeScriptCodeCompletionBinding.cs
2 parents 374d707 + 0ddc22e commit d47aa98

23 files changed

+69594
-42610
lines changed

src/TypeScriptBinding/Hosting/ActualSignatureInfo.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/TypeScriptBinding/Hosting/CompilerOptions.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,35 @@ public CompilerOptions()
5858
public bool? diagnostics { get; set; }
5959
public bool? emitBOM { get; set; }
6060
public bool? help { get; set; }
61+
public bool? inlineSourceMap { get; set; }
62+
public bool? inlineSources { get; set; }
63+
public bool? listFiles { get; set; }
6164
public string locale { get; set; }
6265
public string mapRoot { get; set; }
6366
public ModuleKind? module { get; set; }
67+
public NewLineKind? newLine { get; set; }
68+
public bool? noEmit { get; set; }
69+
public bool? noEmitHelpers { get; set; }
6470
public bool? noEmitOnError { get; set; }
6571
public bool? noErrorTruncation { get; set; }
6672
public bool? noImplicitAny { get; set; }
6773
public bool? noLib { get; set; }
68-
public bool? noLibCheck { get; set; }
6974
public bool? noResolve { get; set; }
7075
public string @out { get; set; }
7176
public string outDir { get; set; }
7277
public bool? preserveConstEnums { get; set; }
78+
public string project { get; set; }
7379
public bool? removeComments { get; set; }
80+
public string rootDir { get; set; }
7481
public bool? sourceMap { get; set; }
7582
public string sourceRoot { get; set; }
7683
public bool? suppressImplicitAnyIndexErrors { get; set; }
7784
public ScriptTarget? target { get; set; }
7885
public bool? version { get; set; }
7986
public bool? watch { get; set; }
87+
public bool? solatedModules { get; set; }
88+
public bool? experimentalDecorators { get; set; }
89+
public bool? emitDecoratorMetadata { get; set; }
8090
// [option: string]: string | number | boolean;
8191
}
8292
}

src/TypeScriptBinding/Hosting/CompletionEntry.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public CompletionEntry()
4141
public string name { get; set; }
4242
public string kind { get; set; } // see ScriptElementKind
4343
public string kindModifiers { get; set; } // see ScriptElementKindModifier, comma separated
44+
public string sortText { get; set; }
4445

4546
public override string ToString()
4647
{

src/TypeScriptBinding/Hosting/CompletionEntryDetails.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,21 @@ public class CompletionEntryDetails
3434
public CompletionEntryDetails()
3535
{
3636
this.name = "";
37-
this.type = "";
3837
this.kind = "";
3938
this.kindModifiers = "";
4039
this.displayParts = new SymbolDisplayPart[0];
4140
this.documentation = new SymbolDisplayPart[0];
4241
}
4342

4443
public string name { get; set; }
45-
public string type { get; set; }
4644
public string kind { get; set; } // see ScriptElementKind
4745
public string kindModifiers { get; set; } // see ScriptElementKindModifier, comma separated
4846
public SymbolDisplayPart[] displayParts { get; set; }
4947
public SymbolDisplayPart[] documentation { get; set; }
5048

5149
public override string ToString()
5250
{
53-
return string.Format("[CompletionEntryDetails Name={0}, Type={1}, Kind={2}]", name, type, kind);
51+
return string.Format("[CompletionEntryDetails Name={0}, Kind={1}]", name, kind);
5452
}
5553
}
5654
}

src/TypeScriptBinding/Hosting/CompletionInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public CompletionInfo()
3838
}
3939

4040
public bool isMemberCompletion { get; set; }
41+
public bool isNewIdentifierLocation { get; set; } // true when the current location also allows for a new identifier
4142
public CompletionEntry[] entries;
4243
}
4344
}

src/TypeScriptBinding/Hosting/Diagnostic.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class Diagnostic
3838
public string message { get; set; }
3939
public DiagnosticCategory category { get; set; }
4040
public int code { get; set; }
41-
public bool? isEarly { get; set; }
4241

4342
public string GetDiagnosticMessage()
4443
{

src/TypeScriptBinding/Hosting/EmitOutput.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ public class EmitOutput
3434
{
3535
public EmitOutput()
3636
{
37-
emitOutputStatus = EmitReturnStatus.Succeeded;
3837
outputFiles = new OutputFile[0];
3938
}
4039

4140
public OutputFile[] outputFiles;
42-
public EmitReturnStatus emitOutputStatus;
41+
public bool emitSkipped;
4342
}
4443
}

src/TypeScriptBinding/Hosting/EmitReturnStatus.cs

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/TypeScriptBinding/Hosting/ILanguageServiceShimHost.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ public interface ILanguageServiceShimHost : ILogger
3535
string getCompilationSettings();
3636
string getScriptFileNames();
3737
string getScriptVersion(string fileName);
38-
bool getScriptIsOpen(string fileName);
3938
IScriptSnapshotShim getScriptSnapshot(string fileName);
4039
string getLocalizedDiagnosticMessages();
4140
ICancellationToken getCancellationToken();
4241
string getCurrentDirectory();
4342
string getDefaultLibFilename(string options);
43+
string getNewLine();
44+
string getProjectVersion();
45+
bool useCaseSensitiveFileNames();
4446
}
4547
}

src/TypeScriptBinding/Hosting/ILogger.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@ namespace ICSharpCode.TypeScriptBinding.Hosting
3333
{
3434
public interface ILogger
3535
{
36-
bool information();
37-
bool debug();
38-
bool warning();
39-
bool error();
40-
bool fatal();
4136
void log(string s);
37+
void trace(string s);
38+
void error(string s);
4239
}
4340
}

0 commit comments

Comments
 (0)