Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Speed up if tables are involved and changed highlighting of parameters in steps #26

Open
wants to merge 116 commits into
base: master
Choose a base branch
from
Open

Speed up if tables are involved and changed highlighting of parameters in steps #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
e343f18
If a step has a table as a parameter, the stepDefinition.matches(...)…
debritod Jan 23, 2015
5da9af1
The highlighting of the parameters in a story-step should be done by …
debritod Jan 23, 2015
37b3fa2
Resolved deprecation issues.
debritod Jan 23, 2015
2a7ac5e
Proper annotation for parameters in steps.
debritod Jan 23, 2015
d1a5754
parse GivenStories and its text and resolve the specified files
debritod Jan 28, 2015
00075e4
new plugin version
debritod Jan 28, 2015
06f69f0
parse GivenStories and its text and resolve the specified files
debritod Feb 10, 2015
62aa37c
settings are project based now
debritod Feb 10, 2015
e28c0de
Fix: accepting and parsing GivenStories: within Scenario:.
debritod Feb 24, 2015
3524c8e
show parameters in annotation
debritod Feb 25, 2015
4e3d7ef
bugfix: if a table starts with whitespaces, the lexer doesn't recogni…
debritod Mar 5, 2015
05a0e24
implementing a new parser and a new lexer with grammar-kit
debritod Mar 10, 2015
fceee00
last working
debritod Mar 11, 2015
bc43418
last working
debritod Mar 11, 2015
882ccad
parse GivenStories and its text and resolve the specified files
debritod Mar 12, 2015
377a6b7
last working
debritod Mar 12, 2015
bd5263a
fixed completion
debritod Mar 17, 2015
bfa07c6
fixed parser and lexer by using grammar kit now
debritod Mar 17, 2015
6b8a797
fixed parser and lexer by using grammar kit now
debritod Mar 17, 2015
4d3df11
working version
debritod Mar 18, 2015
1d8a49e
needed for parsing
debritod Mar 18, 2015
f6263fc
working setup
debritod Mar 18, 2015
466a21d
refactoring ready to implement StoryStep rename refactoring
debritod Mar 19, 2015
4f05a7a
refactoring ready to implement StoryStep rename refactoring
debritod Mar 19, 2015
e7858cb
refactoring ready to implement StoryStep rename refactoring
debritod Mar 19, 2015
030596f
refactoring ready to implement StoryStep rename refactoring
debritod Mar 19, 2015
228bb46
Signed-off-by: debritod <[email protected]>
debritod Mar 19, 2015
e817300
really last step before implementing setName(...)
debritod Mar 19, 2015
948a89f
working rename refactoring
debritod Mar 20, 2015
7ff72c3
working table reformater
debritod Mar 20, 2015
54d63bf
updated plugin.xml for version 2.0
debritod Mar 23, 2015
891fc10
bnf without newline
debritod Mar 23, 2015
f3fa04d
reverted to having newline and spaces
debritod Mar 23, 2015
c337234
formatting is working
debritod Mar 23, 2015
e493c35
formatting is working even in table alone stories
debritod Mar 23, 2015
5630205
working
debritod Mar 23, 2015
42a9d41
test release
debritod Mar 23, 2015
176a200
test release2
debritod Mar 24, 2015
21af0c3
accepts multi spaces and newlines
debritod Mar 26, 2015
0c04010
working completion over project and libraries
debritod Mar 27, 2015
648059c
working lexer
debritod Mar 27, 2015
eb1837c
added comment
debritod Mar 27, 2015
c24f60b
working code
debritod Mar 30, 2015
60780ba
insert without indenting
debritod Mar 30, 2015
755b638
seems to work now
debritod Apr 1, 2015
23f1572
try different approach
debritod Apr 2, 2015
9744d13
TokenMap+StoryAnnotator and Completion fixed
debritod Apr 2, 2015
a177bb8
cleanup
debritod Apr 2, 2015
7677509
basic folding
debritod Apr 2, 2015
a9fd1d2
basic structureView
debritod Apr 3, 2015
f8fcd92
fixed file name completion of story paths
debritod Apr 3, 2015
1a945a4
cleanup
debritod Apr 7, 2015
6fb2e57
renaming
debritod Apr 7, 2015
46cae6f
renaming
debritod Apr 7, 2015
1a8a44b
renaming and cleanup
debritod Apr 7, 2015
0187639
renaming and cleanup
debritod Apr 7, 2015
7fe24dd
corrected completion for postfix ":" and forgetting parameters if ste…
debritod Apr 7, 2015
9591e7a
corrected completion for postfix ":" and forgetting parameters if ste…
debritod Apr 7, 2015
acf2591
IntellijRulezzz is now pointing to a constant
debritod Apr 7, 2015
5e31fca
improved for StoryStep
debritod Apr 7, 2015
d646c86
corrected completion for postfix ":" and forgetting parameters if ste…
debritod Apr 8, 2015
8fec972
rename refactoring of step parameters and user inject
debritod Apr 9, 2015
deb4e98
renamed
debritod Apr 9, 2015
d3c924d
deleted
debritod Apr 9, 2015
199b4d4
renamed
debritod Apr 9, 2015
e63f8ec
don't annotate tables and storypaths
debritod Apr 9, 2015
2c7e4fd
keep linebreaks
debritod Apr 9, 2015
a0c7b1d
support syntax coloring of tables and tablerows
debritod Apr 9, 2015
b2c522b
support syntax coloring of tables and tablerows speedup
debritod Apr 9, 2015
0abaa48
added feature description to plugin description
debritod Apr 9, 2015
1652ddd
not needed anymore
debritod Apr 14, 2015
c613684
overworked lexer, parser, formatting
debritod Apr 14, 2015
a1ec07b
not needed anymore
debritod Apr 14, 2015
01e6ca6
generated parser classes
debritod Apr 14, 2015
d704d02
several bug fixes
debritod Apr 15, 2015
ea901a5
MultiTextLine has multi newlines now.
debritod Apr 15, 2015
42b1b41
StoryPath is always resolved, but only in GivenStories it shows an er…
debritod Apr 15, 2015
ff1f354
no newlines needed after lifecycle after: block
debritod Apr 16, 2015
99bd62d
added @NotNull
debritod Apr 16, 2015
3f2c45c
added @NotNull
debritod Apr 16, 2015
71d2dfd
support for injects in storypath
debritod Apr 17, 2015
1ad51a8
renamed
debritod Apr 17, 2015
04e43f2
renamed
debritod Apr 17, 2015
cfc3325
renamed
debritod Apr 17, 2015
6230cc3
renamed
debritod Apr 17, 2015
f8b624f
renamed
debritod Apr 17, 2015
6d6b97a
fixed folding bug and other newline issues
debritod Apr 17, 2015
896d580
cleaned up formatting settings
debritod Apr 17, 2015
d338f3a
fixed setup of indenting, alignement and spacing
debritod Apr 20, 2015
3fcdb1c
fixed setup of indenting, alignement and spacing
debritod Apr 21, 2015
648ed56
fixed setup of indenting, alignement and spacing
debritod Apr 21, 2015
f864052
fixed setup of indenting, alignement and spacing
debritod Apr 21, 2015
adfe4e6
fixed step parameter rename refactoring
debritod Apr 21, 2015
5e5ca8b
fixed inject rename refactoring
debritod Apr 21, 2015
2723c73
fixed step parameter rename refactoring
debritod Apr 21, 2015
b049790
fixed indent
debritod Apr 21, 2015
a32d84c
fixed default code style settings
debritod Apr 22, 2015
7331c5f
fixed annotator for tables
debritod Apr 22, 2015
b36ad51
Fixed bug when a story step is longer then all java steps, but the st…
debritod Apr 22, 2015
5c46da6
Moved annotatin stuff to ParserRule elements and fixed a bug with not…
debritod Apr 22, 2015
ef5c67c
Step tokens are accepted in multitextline, now.
debritod Apr 22, 2015
e4dfbb8
inspections
debritod Apr 22, 2015
485081f
new version
debritod Apr 22, 2015
3d4f352
new version
debritod Apr 24, 2015
72b6ea0
fixed user inject bug and anAction NullPointerExceptions
debritod Apr 24, 2015
c6746b5
changhed author
debritod Apr 24, 2015
da69173
fixed: words like: blabla<<inject>> combination were not properly res…
debritod May 18, 2015
d77e6a4
fixed: storypaths had problems with user and system injects
debritod May 22, 2015
15564dd
for release 2.2.2
debritod May 22, 2015
a664b2d
generalization of TokenMap
debritod May 26, 2015
789b39e
TokenMap includes step-parameters ("$"), now. This is the first step …
debritod May 28, 2015
d836d95
TokenMap fills a visitor in the get(...) method now, instead of retur…
debritod Jun 1, 2015
04fc9bb
change inject unwrapper to using regex
debritod Jun 10, 2015
1cf2cca
Try to get rid of ParametrizedString.
debritod Jun 10, 2015
7c510eb
added comment
debritod Jun 10, 2015
12e253a
removed WeightChain
datensenke Nov 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions IntelliJBehave.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/lib" />
<excludeFolder url="file://$MODULE_DIR$/target" />
<excludeFolder url="file://$MODULE_DIR$/testLib" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Expand Down Expand Up @@ -207,5 +210,4 @@
</map>
</option>
</component>
</module>

</module>
110 changes: 86 additions & 24 deletions META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<li><a href="https://github.com/Arnauld">https://github.com/Arnauld</a></li>
<li><a href="https://github.com/harley84">https://github.com/harley84</a></li>
<li><a href="https://github.com/dmalch">https://github.com/dmalch</a></li>
<li><a href="https://github.com/debritod">https://github.com/debritod</a></li>
</ul>
And <a href="https://github.com/witspirit/IntelliJBehave/graphs/contributors">others</a>.
</p>
Expand All @@ -45,6 +46,8 @@
The plugin provides the following features:
</p>
<ul>
<li> Reformat of stories </li>
<li> Rename refactoring of steps </li>
<li> Basic syntax highlighting for JBehave story files</li>
<li> Jump to step definition in Java or Groovy</li>
<li> Error Highlighting in story if step was not defined</li>
Expand All @@ -53,6 +56,8 @@
<li> Code inspections to report unused steps definitions and undefined step usages </li>
<li> Run *.story files</li>
<li> Finding usages of steps methods </li>
<li> Jump to files given in GivenStories </li>
<li> Show parameter names of step implementation (point the mouse over the parameter of an step) </li>
</ul>

<p>
Expand All @@ -64,6 +69,37 @@
</ul>

<h2>Release notes:</h2>
<p>New in version 2.2.2: Bug fix: user- and system-inject in story-paths</p>
<p>New in version 2.2.1: Bug fix</p>
<p>
New in version 2.2.0:
</p>
<ul>
<li> Some reformat customizations </li>
<li> A lot of bug fixes </li>
</ul>
<p>
New in version 2.1.0:
</p>
<ul>
<li> Structure view </li>
<li> Rename factoring of injects </li>
<li> Rename factoring of step parameters </li>
<li> Coloring of tables, table rows and table cells </li>
</ul>
<p>
New in version 2.00:
</p>
<ul>
<li> New parser </li>
<li> Reformat of stories </li>
<li> Rename refactoring of steps </li>
<li> Working and useful completion </li>
<li> Find usages of step definitions </li>
<li> Folding </li>
<li> Jump to files given in GivenStories </li>
<li> Show parameter names of step implementation (point the mouse over the parameter of an step) </li>
</ul>
<p>
New in version 1.5:
</p>
Expand All @@ -73,7 +109,7 @@
<li>JBehave icon has been updated</li>
</ul>
]]></description>
<version>1.52</version>
<version>2.2.2</version>
<vendor url="https://github.com/witspirit" email="[email protected]">Bert Van Vlerken, Victor Rosenberg</vendor>

<idea-version since-build="133.0"/>
Expand All @@ -83,17 +119,16 @@
<implementation-class>com.github.kumaraman21.intellijbehave.template.JBehaveTemplateLoaderComponent
</implementation-class>
</component>
<component>
<implementation-class>com.github.kumaraman21.intellijbehave.settings.JBehaveSettings</implementation-class>
</component>
<component>
<implementation-class>com.github.kumaraman21.intellijbehave.runner.StoryRunnerConfigurationType
</implementation-class>
</component>
</application-components>

<project-components>
<!-- Add your project components here -->
<!--<component>-->
<!--<implementation-class>com.github.kumaraman21.intellijbehave.settings.JBehaveSettings</implementation-class>-->
<!--</component>-->
</project-components>

<actions>
Expand All @@ -112,34 +147,61 @@

<extensions defaultExtensionNs="com.intellij">
<projectConfigurable instance="com.github.kumaraman21.intellijbehave.settings.JBehaveConfigurable"/>
<spellchecker.support language="Story"
<spellchecker.support language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.spellchecker.JBehaveSpellcheckerStrategy"/>
<fileTypeFactory implementation="com.github.kumaraman21.intellijbehave.language.StoryFileTypeFactory"/>
<lang.parserDefinition language="Story"
implementationClass="com.github.kumaraman21.intellijbehave.parser.StoryParserDefinition"/>
<annotator language="Story"
implementationClass="com.github.kumaraman21.intellijbehave.resolver.StoryAnnotator"/>
<lang.commenter language="Story"
implementationClass="com.github.kumaraman21.intellijbehave.commenter.StoryCommenter"/>
<colorSettingsPage implementation="com.github.kumaraman21.intellijbehave.highlighter.StoryColorsAndFontsPage"/>
<completion.contributor language="Story"
implementationClass="com.github.kumaraman21.intellijbehave.completion.StoryCompletionContributor"/>
<fileTypeFactory implementation="com.github.kumaraman21.intellijbehave.language.JBehaveFileTypeFactory"/>
<lang.parserDefinition language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.parser.JBehaveParserDefinition"/>
<annotator language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.resolver.JBehaveAnnotator"/>
<lang.commenter language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.commenter.JBehaveCommenter"/>
<colorSettingsPage
implementation="com.github.kumaraman21.intellijbehave.highlighter.JBehaveColorsAndFontsPage"/>
<completion.contributor language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.completion.JBehaveCompletionContributor"/>

<referencesSearch
implementation="com.github.kumaraman21.intellijbehave.service.JBehaveJavaStepDefinitionSearch"/>
implementation="com.github.kumaraman21.intellijbehave.service.JavaStepDefinitionsSearch"/>
<methodReferencesSearch
implementation="com.github.kumaraman21.intellijbehave.service.JBehaveJavaMethodUsageSearcher"/>
implementation="com.github.kumaraman21.intellijbehave.service.JavaMethodUsageSearcher"/>
<!--code inspections-->
<localInspection id="unusedStepDeclaration" language="JAVA" displayName="Unused step declaration"
groupName="JBehave" enabledByDefault="false" level="WARNING"
implementationClass="com.github.kumaraman21.intellijbehave.codeInspector.UnusedStepDeclarationInspection"/>
<localInspection id="undefinedStep" language="Story" displayName="Undefined step"
groupName="JBehave" enabledByDefault="true" level="WARNING"
implementationClass="com.github.kumaraman21.intellijbehave.codeInspector.UndefinedStepInspection"/>
<psi.referenceContributor
implementation="com.github.kumaraman21.intellijbehave.resolver.StepPsiReferenceContributor"/>
implementation="com.github.kumaraman21.intellijbehave.resolver.ScenarioStepReferenceContributor"/>

<projectService serviceInterface="com.github.kumaraman21.intellijbehave.service.JBehaveStepsIndex"
serviceImplementation="com.github.kumaraman21.intellijbehave.service.JBehaveStepsIndex"/>
<projectService serviceInterface="com.github.kumaraman21.intellijbehave.service.JavaStepDefinitionsIndex"
serviceImplementation="com.github.kumaraman21.intellijbehave.service.JavaStepDefinitionsIndex"/>
<projectService serviceInterface="com.github.kumaraman21.intellijbehave.settings.JBehaveSettings"
serviceImplementation="com.github.kumaraman21.intellijbehave.settings.JBehaveSettings"/>
<renameHandler implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveRenameAnnotationHandler"/>
<renamePsiElementProcessor id="annotation"
implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveRenameAnnotationProcessor"
order="last"/>
<renameHandler implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveRenameInjectHandler"/>
<renamePsiElementProcessor id="inject"
implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveRenameInjectProcessor"
order="first"/>
<renameHandler
implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveRenameStepParameterHandler"/>
<renamePsiElementProcessor id="stepParameter"
implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveRenameStepParameterProcessor"
order="first"/>
<nameSuggestionProvider
implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveNameSuggestionProvider"/>
<elementDescriptionProvider
implementation="com.github.kumaraman21.intellijbehave.refactor.JBehaveElementDescriptionProvider"/>
<lang.formatter implementationClass="com.github.kumaraman21.intellijbehave.formatter.StoryFormattingBuilder"
language="JBehave"/>
<codeStyleSettingsProvider
implementation="com.github.kumaraman21.intellijbehave.codeStyle.JBehaveCodeStyleSettingsProvider"/>
<langCodeStyleSettingsProvider
implementation="com.github.kumaraman21.intellijbehave.codeStyle.JBehaveLanguageCodeStyleSettingsProvider"/>
<lang.foldingBuilder language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.folding.JBehaveFoldingBuilder"/>
<lang.psiStructureViewFactory language="JBehave"
implementationClass="com.github.kumaraman21.intellijbehave.structureView.StructureViewFactory"/>
</extensions>
</idea-plugin>
161 changes: 161 additions & 0 deletions gen/com/github/kumaraman21/intellijbehave/parser/IJBehaveElementType.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading