From fad7851829b3da0fddc3d3a2d1d0e46b9f672861 Mon Sep 17 00:00:00 2001
From: Oliver Blanthorn <freedom4cows@gmail.com>
Date: Sun, 22 Apr 2018 17:15:40 +0100
Subject: [PATCH] Fix #394: rename generated source .name.generated.ext

---
 .gitignore               | 4 ++--
 scripts/build.sh         | 2 +-
 scripts/excmds_macros.py | 2 +-
 src/background.ts        | 2 +-
 src/content.ts           | 2 +-
 src/controller.ts        | 2 +-
 src/excmds.ts            | 2 +-
 src/keyseq.ts            | 7 +++++--
 src/parsers/exmode.ts    | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3f30783..ada42d25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 AMOKEYS
 build
 node_modules
-src/excmds_background.ts
-src/excmds_content.ts
+src/.excmds_background.generated.ts
+src/.excmds_content.generated.ts
 src/grammars/*.ts
 generated
 web-ext-artifacts
diff --git a/scripts/build.sh b/scripts/build.sh
index 9563abb2..6bd63990 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -12,7 +12,7 @@ scripts/excmds_macros.py
 scripts/newtab.md.sh
 scripts/make_tutorial.sh
 scripts/make_docs.sh &
-nearleyc src/grammars/bracketexpr.ne > src/grammars/bracketexpr.ts
+nearleyc src/grammars/bracketexpr.ne > src/grammars/.bracketexpr.generated.ts
 
 (webpack --display errors-only && scripts/git_version.sh)&
 
diff --git a/scripts/excmds_macros.py b/scripts/excmds_macros.py
index 598ed720..78b2b3a4 100755
--- a/scripts/excmds_macros.py
+++ b/scripts/excmds_macros.py
@@ -162,7 +162,7 @@ def main():
                 else:
                     output += line
             # print(output.rstrip())
-            with open("src/excmds_{context}.ts".format(**locals()), "w") as sink:
+            with open("src/.excmds_{context}.generated.ts".format(**locals()), "w") as sink:
                 print(output.rstrip(), file=sink)
 
 
diff --git a/src/background.ts b/src/background.ts
index ed0e65e7..79c1f3df 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -15,7 +15,7 @@ CommandLine.onLine.addListener(Controller.acceptExCmd)
 
 // Add various useful modules to the window for debugging
 import * as messaging from "./messaging"
-import * as excmds from "./excmds_background"
+import * as excmds from "./.excmds_background.generated"
 import * as commandline_background from "./commandline_background"
 import * as controller from "./controller"
 import * as convert from "./convert"
diff --git a/src/content.ts b/src/content.ts
index 46d81032..c3300ea3 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -16,7 +16,7 @@ import * as commandline_content from "./commandline_content"
 import * as convert from "./convert"
 import * as config from "./config"
 import * as dom from "./dom"
-import * as excmds from "./excmds_content"
+import * as excmds from "./.excmds_content.generated"
 import * as hinting_content from "./hinting"
 import * as finding_content from "./finding"
 import * as itertools from "./itertools"
diff --git a/src/controller.ts b/src/controller.ts
index 7b17232c..7bcf25e9 100644
--- a/src/controller.ts
+++ b/src/controller.ts
@@ -2,7 +2,7 @@ import { MsgSafeKeyboardEvent, MsgSafeNode } from "./msgsafe"
 import { isTextEditable } from "./dom"
 import { isSimpleKey } from "./keyseq"
 import state from "./state"
-import { repeat } from "./excmds_background"
+import { repeat } from "./.excmds_background.generated"
 import Logger from "./logging"
 
 import { parser as exmode_parser } from "./parsers/exmode"
diff --git a/src/excmds.ts b/src/excmds.ts
index 4a8af5ce..c94f1951 100644
--- a/src/excmds.ts
+++ b/src/excmds.ts
@@ -100,7 +100,7 @@ import Mark from "mark.js"
 //#content_helper
 // {
 import "./number.clamp"
-import * as SELF from "./excmds_content"
+import * as SELF from "./.excmds_content.generated"
 Messaging.addListener("excmd_content", Messaging.attributeCaller(SELF))
 import * as DOM from "./dom"
 import { executeWithoutCommandLine } from "./commandline_content"
diff --git a/src/keyseq.ts b/src/keyseq.ts
index 8f2b65e2..cab4ab48 100644
--- a/src/keyseq.ts
+++ b/src/keyseq.ts
@@ -23,7 +23,7 @@
 /** */
 import { find, izip } from "./itertools"
 import { Parser } from "./nearley_utils"
-import * as bracketexpr_grammar from "./grammars/bracketexpr"
+import * as bracketexpr_grammar from "./grammars/.bracketexpr.generated"
 const bracketexpr_parser = new Parser(bracketexpr_grammar)
 
 // {{{ General types
@@ -124,7 +124,10 @@ export function parse(keyseq: KeyEventLike[], map: KeyMap): ParserResponse {
         // Check if any of the mappings is a perfect match (this will only
         // happen if some sequences in the KeyMap are prefixes of other seqs).
         try {
-            let perfect = find(possibleMappings, ([k, v]) => k.length === keyseq.length)
+            let perfect = find(
+                possibleMappings,
+                ([k, v]) => k.length === keyseq.length,
+            )
             return { value: perfect[1], isMatch: true }
         } catch (e) {
             if (!(e instanceof RangeError)) throw e
diff --git a/src/parsers/exmode.ts b/src/parsers/exmode.ts
index 02eddcc7..039d0d1b 100644
--- a/src/parsers/exmode.ts
+++ b/src/parsers/exmode.ts
@@ -1,6 +1,6 @@
 /** Ex Mode (AKA cmd mode) */
 
-import * as ExCmds from "../excmds_background"
+import * as ExCmds from "../.excmds_background.generated"
 import * as convert from "../convert"
 import * as Config from "../config"
 import * as aliases from "../aliases"