From 5e60a5b2f74be98728b3eaa9b70ec6877f80e047 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Tue, 30 Oct 2018 11:33:52 +0100
Subject: [PATCH] CIF writer fix
---
src/mol-io/writer/cif/encoder/text.ts | 2 +-
src/mol-state/selection.ts | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mol-io/writer/cif/encoder/text.ts b/src/mol-io/writer/cif/encoder/text.ts
index 9a8c7ddbe..91c0d897f 100644
--- a/src/mol-io/writer/cif/encoder/text.ts
+++ b/src/mol-io/writer/cif/encoder/text.ts
@@ -235,7 +235,7 @@ function writeChecked(builder: StringBuilder, val: string) {
}
const fst = val.charCodeAt(0);
- if (!escape && (fst === 35 /* # */ || fst === 59 /* ; */ || hasWhitespace)) {
+ if (!escape && (fst === 35 /* # */|| fst === 36 /* $ */ || fst === 59 /* ; */ || fst === 91 /* [ */ || fst === 93 /* ] */ || hasWhitespace)) {
escapeCharStart = '\'';
escapeCharEnd = '\' ';
escape = true;
diff --git a/src/mol-state/selection.ts b/src/mol-state/selection.ts
index b442e5623..60c512855 100644
--- a/src/mol-state/selection.ts
+++ b/src/mol-state/selection.ts
@@ -40,13 +40,13 @@ namespace StateSelection {
}
export interface Builder {
- flatMap(f: (n: Node) => Node[]): Builder;
- mapEntity(f: (n: Node) => Node): Builder;
+ flatMap(f: (n: StateObject.Node) => StateObject.Node[]): Builder;
+ mapEntity(f: (n: StateObject.Node) => StateObject.Node): Builder;
unique(): Builder;
parent(): Builder;
first(): Builder;
- filter(p: (n: Node) => boolean): Builder;
+ filter(p: (n: StateObject.Node) => boolean): Builder;
subtree(): Builder;
children(): Builder;
ofType(t: StateObject.Type): Builder;
--
GitLab