build

Talv · May 17, 2018 · e7fa3c8 · e7fa3c8
1 parent 06a4865
commit e7fa3c8
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 61 deletions.
diff --git a/lib/compiler/parser.js b/lib/compiler/parser.js
diff --git a/lib/compiler/parser.js.map b/lib/compiler/parser.js.map
diff --git a/lib/sc2mod/archive.d.ts b/lib/sc2mod/archive.d.ts
@@ -36,7 +36,10 @@ export interface ArchiveLink {
     src: string;
 }
 export declare function resolveArchiveDirectory(name: string, sources: string[]): string;
-export declare function resolveArchiveDependencyList(archive: SC2Archive, sources: string[], overrides?: Map<string, string>, list?: ArchiveLink[]): Promise<ArchiveLink[]>;
+export declare function resolveArchiveDependencyList(rootArchive: SC2Archive, sources: string[], overrides?: Map<string, string>): Promise<{
+    list: ArchiveLink[];
+    unresolvedNames: string[];
+}>;
 export declare function openArchiveWorkspace(archive: SC2Archive, sources: string[], overrides?: Map<string, string>, extra?: Map<string, string>): Promise<SC2Workspace>;
 export declare class SC2Archive {
     name: string;

diff --git a/lib/sc2mod/archive.js b/lib/sc2mod/archive.js
diff --git a/lib/sc2mod/archive.js.map b/lib/sc2mod/archive.js.map
diff --git a/lib/service/s2meta.js b/lib/service/s2meta.js
diff --git a/lib/service/s2meta.js.map b/lib/service/s2meta.js.map
diff --git a/lib/service/server.d.ts b/lib/service/server.d.ts
@@ -20,6 +20,7 @@ export declare class Server {
     private createProvider<T>(cls);
     createConnection(connection?: lsp.IConnection): lsp.IConnection;
     log(msg: string, ...params: any[]): void;
+    showErrorMessage(msg: string): void;
     private flushDocument(documentUri, isDirty?);
     private reindex(rootPath, modSources);
     private onInitialize(params);

diff --git a/lib/service/server.js b/lib/service/server.js
diff --git a/lib/service/server.js.map b/lib/service/server.js.map
diff --git a/lib/service/store.d.ts b/lib/service/store.d.ts
@@ -41,6 +41,6 @@ export declare class Store {
     getFirstMatchingDocument(partialname: string): gt.SourceFile;
     updateDocument(document: lsp.TextDocument, check?: boolean): void;
     updateS2Workspace(workspace: SC2Workspace, lang: string): Promise<void>;
-    isUriInWorkspace(documentUri: string, includeDepds?: boolean): boolean;
+    isUriInWorkspace(documentUri: string): boolean;
     resolveGlobalSymbol(name: string): gt.Symbol | undefined;
 }
diff --git a/lib/service/store.js b/lib/service/store.js