Skip to content

Commit

Permalink
Autofix: TypeScript imports
Browse files Browse the repository at this point in the history
[atomist:generated] [atomist:autofix=TypeScript imports]
  • Loading branch information
atomist-bot committed Sep 16, 2018
1 parent c047347 commit 3559a3a
Show file tree
Hide file tree
Showing 41 changed files with 274 additions and 69 deletions.
25 changes: 20 additions & 5 deletions lib/Microgrammar.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
import { InputState, Listeners } from "./InputState";
import { MatchingLogic, Term } from "./Matchers";
import { Concat, toMatchingLogic } from "./matchers/Concat";
import {
InputState,
Listeners,
} from "./InputState";
import {
MatchingLogic,
Term,
} from "./Matchers";
import {
Concat,
toMatchingLogic,
} from "./matchers/Concat";
import { isSuccessfulMatch } from "./MatchPrefixResult";
import { DismatchReport, PatternMatch } from "./PatternMatch";
import {
DismatchReport,
PatternMatch,
} from "./PatternMatch";

import { InputStream } from "./spi/InputStream";
import { StringInputStream } from "./spi/StringInputStream";
Expand All @@ -13,7 +25,10 @@ import { DefaultInputState } from "./internal/DefaultInputState";
import { exactMatch } from "./internal/ExactMatch";
import { InputStateManager } from "./internal/InputStateManager";
import { MicrogrammarSpecParser } from "./internal/MicrogrammarSpecParser";
import { MatchUpdater, MicrogrammarUpdates } from "./internal/MicrogrammarUpdates";
import {
MatchUpdater,
MicrogrammarUpdates,
} from "./internal/MicrogrammarUpdates";
import { readyToMatch } from "./internal/Whitespace";

/**
Expand Down
12 changes: 10 additions & 2 deletions lib/Ops.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
import { InputState } from "./InputState";
import { MatchingLogic } from "./Matchers";
import { toMatchingLogic } from "./matchers/Concat";
import { isSuccessfulMatch, MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "./MatchPrefixResult";
import { PatternMatch, UndefinedPatternMatch } from "./PatternMatch";
import {
isSuccessfulMatch,
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "./MatchPrefixResult";
import {
PatternMatch,
UndefinedPatternMatch,
} from "./PatternMatch";

/**
* Optional match on the given matcher
Expand Down
6 changes: 5 additions & 1 deletion lib/Primitives.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { InputState } from "./InputState";
import { MatchingLogic } from "./Matchers";
import { MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "./MatchPrefixResult";
import {
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "./MatchPrefixResult";
import { TerminalPatternMatch } from "./PatternMatch";

/**
Expand Down
12 changes: 10 additions & 2 deletions lib/Rep.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
import { InputState } from "./InputState";
import { MatchingLogic } from "./Matchers";
import { toMatchingLogic } from "./matchers/Concat";
import { isSuccessfulMatch, MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "./MatchPrefixResult";
import { PatternMatch, TerminalPatternMatch } from "./PatternMatch";
import {
isSuccessfulMatch,
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "./MatchPrefixResult";
import {
PatternMatch,
TerminalPatternMatch,
} from "./PatternMatch";

import { WhiteSpaceHandler } from "./Config";
import { readyToMatch } from "./internal/Whitespace";
Expand Down
7 changes: 6 additions & 1 deletion lib/internal/Break.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { InputState } from "../InputState";
import { MatchingLogic } from "../Matchers";
import { isSuccessfulMatch, MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "../MatchPrefixResult";
import {
isSuccessfulMatch,
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "../MatchPrefixResult";
import { TerminalPatternMatch } from "../PatternMatch";
import { readyToMatch } from "./Whitespace";

Expand Down
6 changes: 5 additions & 1 deletion lib/internal/DefaultInputState.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { InputState, Listeners, Skipped } from "../InputState";
import {
InputState,
Listeners,
Skipped,
} from "../InputState";
import { InputStateManager } from "./InputStateManager";

/**
Expand Down
10 changes: 8 additions & 2 deletions lib/internal/ExactMatch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@ import { Listeners } from "../InputState";
import { MatchingLogic } from "../Matchers";
import { Concat } from "../matchers/Concat";
import { RestOfInput } from "../matchers/skip/Skip";
import { isSuccessfulMatch, MatchFailureReport } from "../MatchPrefixResult";
import { DismatchReport, PatternMatch } from "../PatternMatch";
import {
isSuccessfulMatch,
MatchFailureReport,
} from "../MatchPrefixResult";
import {
DismatchReport,
PatternMatch,
} from "../PatternMatch";
import { InputStream } from "../spi/InputStream";
import { StringInputStream } from "../spi/StringInputStream";
import { inputStateFromStream } from "./InputStateFactory";
Expand Down
5 changes: 4 additions & 1 deletion lib/internal/InputStateFactory.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { InputState, Listeners } from "../InputState";
import {
InputState,
Listeners,
} from "../InputState";
import { StringInputStream } from "../spi/StringInputStream";

import { InputStream } from "../spi/InputStream";
Expand Down
11 changes: 9 additions & 2 deletions lib/internal/MatcherPrinter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { Matcher, MatchingLogic } from "../Matchers";
import { Concat, isNamedMatcher, MatchStep } from "../matchers/Concat";
import {
Matcher,
MatchingLogic,
} from "../Matchers";
import {
Concat,
isNamedMatcher,
MatchStep,
} from "../matchers/Concat";
import { isLiteral } from "../Primitives";
import { isBreak } from "./Break";

Expand Down
15 changes: 12 additions & 3 deletions lib/internal/MicrogrammarSpecParser.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import { MatchingLogic } from "../Matchers";
import { Concat, toMatchingLogic } from "../matchers/Concat";
import {
Concat,
toMatchingLogic,
} from "../matchers/Concat";
import { Literal } from "../Primitives";

import { WhiteSpaceHandler } from "../Config";
import { FromStringOptions } from "../FromStringOptions";
import { isPatternMatch } from "../PatternMatch";
import { Break } from "./Break";
import { CompleteFromStringOptions, completeWithDefaults } from "./CompleteFromStringOptions";
import {
CompleteFromStringOptions,
completeWithDefaults,
} from "./CompleteFromStringOptions";
import { exactMatch } from "./ExactMatch";
import { MicrogrammarSpec, specGrammar } from "./SpecGrammar";
import {
MicrogrammarSpec,
specGrammar,
} from "./SpecGrammar";

/**
* Convenient function to create a microgrammar from a spec within another grammar
Expand Down
5 changes: 4 additions & 1 deletion lib/internal/MicrogrammarUpdates.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { ChangeSet } from "./ChangeSet";

import { isTreePatternMatch, PatternMatch } from "../PatternMatch";
import {
isTreePatternMatch,
PatternMatch,
} from "../PatternMatch";

export interface MatchUpdater {
newContent(): string;
Expand Down
5 changes: 4 additions & 1 deletion lib/internal/Whitespace.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { InputState, Skipped } from "../InputState";
import {
InputState,
Skipped,
} from "../InputState";
import { MatchingLogic } from "../Matchers";

/**
Expand Down
32 changes: 26 additions & 6 deletions lib/matchers/Concat.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
import { InputState } from "../InputState";
import { LazyMatchingLogic, Matcher, MatchingLogic, Term } from "../Matchers";
import { isSuccessfulMatch, MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "../MatchPrefixResult";
import {
LazyMatchingLogic,
Matcher,
MatchingLogic,
Term,
} from "../Matchers";
import {
isSuccessfulMatch,
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "../MatchPrefixResult";
import { Microgrammar } from "../Microgrammar";
import { isSpecialMember, PatternMatch, TreePatternMatch } from "../PatternMatch";
import { Literal, Regex } from "../Primitives";

import { SkipCapable, WhiteSpaceHandler } from "../Config";
import {
isSpecialMember,
PatternMatch,
TreePatternMatch,
} from "../PatternMatch";
import {
Literal,
Regex,
} from "../Primitives";

import {
SkipCapable,
WhiteSpaceHandler,
} from "../Config";
import { Break } from "../internal/Break";
import { readyToMatch } from "../internal/Whitespace";

Expand Down
11 changes: 9 additions & 2 deletions lib/matchers/Functions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { InputState } from "../InputState";
import { MatchingLogic } from "../Matchers";
import { isSuccessfulMatch, MatchPrefixResult, matchPrefixSuccess } from "../MatchPrefixResult";
import { isTreePatternMatch, TerminalPatternMatch } from "../PatternMatch";
import {
isSuccessfulMatch,
MatchPrefixResult,
matchPrefixSuccess,
} from "../MatchPrefixResult";
import {
isTreePatternMatch,
TerminalPatternMatch,
} from "../PatternMatch";
import { toMatchingLogic } from "./Concat";

/**
Expand Down
5 changes: 4 additions & 1 deletion lib/matchers/lang/cfamily/CBlock.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { InputState } from "../../../InputState";
import { inputStateFromString } from "../../../internal/InputStateFactory";
import { MatchingLogic } from "../../../Matchers";
import { MatchPrefixResult, matchPrefixSuccess } from "../../../MatchPrefixResult";
import {
MatchPrefixResult,
matchPrefixSuccess,
} from "../../../MatchPrefixResult";
import { TerminalPatternMatch } from "../../../PatternMatch";
import { Concat } from "../../Concat";
import { LangStateMachine } from "../LangStateMachine";
Expand Down
7 changes: 6 additions & 1 deletion lib/matchers/lang/cfamily/CFamilyLangHelper.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@

import { LangHelper } from "../LangHelper";
import { CFamilyStateMachine } from "./CFamilyStateMachine";
import { DoubleString, Normal, SlashSlashComment, SlashStarComment } from "./States";
import {
DoubleString,
Normal,
SlashSlashComment,
SlashStarComment,
} from "./States";

export class CFamilyLangHelper implements LangHelper {

Expand Down
12 changes: 10 additions & 2 deletions lib/matchers/lang/cfamily/CFamilyStateMachine.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import { LangState, LangStateMachine } from "../LangStateMachine";
import {DoubleString, Normal, SlashSlashComment, SlashStarComment } from "./States";
import {
LangState,
LangStateMachine,
} from "../LangStateMachine";
import {
DoubleString,
Normal,
SlashSlashComment,
SlashStarComment,
} from "./States";

/**
* State machine for recognizing C family strings and comments.
Expand Down
5 changes: 4 additions & 1 deletion lib/matchers/lang/cfamily/NestingDepthStateMachine.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { AbstractStateMachine } from "../../../support/AbstractStateMachine";
import { LangState, LangStateMachine } from "../LangStateMachine";
import {
LangState,
LangStateMachine,
} from "../LangStateMachine";
import { CFamilyStateMachine } from "./CFamilyStateMachine";
import { Normal } from "./States";

Expand Down
6 changes: 5 additions & 1 deletion lib/matchers/lang/cfamily/java/JavaBody.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { Concat } from "../../../Concat";
import { block, blockContaining, parenthesizedExpression } from "../CBlock";
import {
block,
blockContaining,
parenthesizedExpression,
} from "../CBlock";
import { CFamilyStateMachine } from "../CFamilyStateMachine";

/**
Expand Down
6 changes: 5 additions & 1 deletion lib/matchers/snobol/Span.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { InputState } from "../../InputState";
import { MatchingLogic } from "../../Matchers";
import { MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "../../MatchPrefixResult";
import {
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "../../MatchPrefixResult";
import { TerminalPatternMatch } from "../../PatternMatch";

/**
Expand Down
5 changes: 4 additions & 1 deletion test/Alt.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import assert = require("power-assert");
import { fail } from "power-assert";
import { isSuccessfulMatch } from "../lib/MatchPrefixResult";

import { Alt, firstOf } from "../lib/Ops";
import {
Alt,
firstOf,
} from "../lib/Ops";

import { inputStateFromString } from "../lib/internal/InputStateFactory";

Expand Down
10 changes: 8 additions & 2 deletions test/Context.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import * as assert from "power-assert";
import { inputStateFromString } from "../lib/internal/InputStateFactory";
import { Concat } from "../lib/matchers/Concat";
import { isSuccessfulMatch, SuccessfulMatch } from "../lib/MatchPrefixResult";
import {
isSuccessfulMatch,
SuccessfulMatch,
} from "../lib/MatchPrefixResult";
import { Microgrammar } from "../lib/Microgrammar";

import { Integer, LowercaseBoolean } from "../lib/Primitives";
import {
Integer,
LowercaseBoolean,
} from "../lib/Primitives";

describe("ContextTest", () => {

Expand Down
11 changes: 9 additions & 2 deletions test/InputStateListener.test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@

import * as assert from "power-assert";
import { InputState, InputStateListener } from "../lib/InputState";
import {
InputState,
InputStateListener,
} from "../lib/InputState";
import { MatchingLogic } from "../lib/Matchers";
import { CFamilyLangHelper } from "../lib/matchers/lang/cfamily/CFamilyLangHelper";
import { CFamilyStateMachine } from "../lib/matchers/lang/cfamily/CFamilyStateMachine";
import { JavaBlock } from "../lib/matchers/lang/cfamily/java/JavaBody";
import { NestingDepthStateMachine } from "../lib/matchers/lang/cfamily/NestingDepthStateMachine";
import { DoubleString } from "../lib/matchers/lang/cfamily/States";
import { MatchFailureReport, MatchPrefixResult, matchPrefixSuccess } from "../lib/MatchPrefixResult";
import {
MatchFailureReport,
MatchPrefixResult,
matchPrefixSuccess,
} from "../lib/MatchPrefixResult";
import { Microgrammar } from "../lib/Microgrammar";
import { when } from "../lib/Ops";
import { TerminalPatternMatch } from "../lib/PatternMatch";
Expand Down
5 changes: 4 additions & 1 deletion test/MavenGrammars.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Concat } from "../lib/matchers/Concat";
import { Microgrammar } from "../lib/Microgrammar";
import { Opt, when } from "../lib/Ops";
import {
Opt,
when,
} from "../lib/Ops";
import { Rep, Rep1 } from "../lib/Rep";

export interface VersionedArtifact {
Expand Down
Loading

0 comments on commit 3559a3a

Please sign in to comment.