[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/kotlin-mode 0b4291625e 2/3: Merge remote-tracking branch '
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/kotlin-mode 0b4291625e 2/3: Merge remote-tracking branch 'upstream/master' |
|
Date: |
Thu, 29 Dec 2022 14:59:11 -0500 (EST) |
branch: elpa/kotlin-mode
commit 0b4291625e707527ee1b0c865326edbf9332d16b
Merge: 337332287b 55eed95033
Author: Jean-Christophe Petkovich <jcpetkovich@gmail.com>
Commit: Jean-Christophe Petkovich <jcpetkovich@gmail.com>
Merge remote-tracking branch 'upstream/master'
---
.gitignore | 2 +
.travis.yml | 11 +-
LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++
Makefile | 56 ++++
doc/string.png | Bin 0 -> 28427 bytes
doc/string.svg | 237 ++++++++++++++++
doc/string_properties.png | Bin 0 -> 60042 bytes
doc/string_properties.svg | 362 +++++++++++++++++++++++++
kotlin-mode-lexer.el | 362 +++++++++++++++++++++++++
kotlin-mode.el | 262 +++++++++++++-----
test/kotlin-mode-test.el | 193 ++++++++++---
test/sample.kt | 163 ++++++-----
12 files changed, 2162 insertions(+), 160 deletions(-)
diff --git a/.gitignore b/.gitignore
index 93d1f2be2a..b08939ede8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
.cask/
dist/
+*~
+*.elc
diff --git a/.travis.yml b/.travis.yml
index 2f333ef8c1..d96fd63142 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,20 @@ before_install:
- evm install $EVM_EMACS --use --skip
- cask
env:
+ - EVM_EMACS=emacs-24.3-travis
+ - EVM_EMACS=emacs-24.4-travis
+ - EVM_EMACS=emacs-24.5-travis
- EVM_EMACS=emacs-25.1-travis
+ - EVM_EMACS=emacs-25.2-travis
+ - EVM_EMACS=emacs-25.3-travis
+ # https://github.com/cask/cask/issues/471
+ #- EVM_EMACS=emacs-26.1-travis
+ #- EVM_EMACS=emacs-26.2-travis
+ #- EVM_EMACS=emacs-26.3-travis
- EVM_EMACS=emacs-git-snapshot-travis
script:
- emacs --version
- - cask exec ert-runner
+ - cask exec ert-runner -L . -L test
notifications:
email: false
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..94a9ed024d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..aa17634b0c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,56 @@
+CASK ?= cask
+EMACS ?= emacs
+VERSION := $(shell EMACS=$(EMACS) $(CASK) version)
+
+SRC = $(wildcard *.el)
+PACKAGE = dist/kotlin-mode-$(VERSION).tar
+
+.PHONY: help all deps package install test clean
+
+help:
+## Shows this message.
+# Process this Makefile with following filters
+#
+# - Remove empty line.
+# - Remove line starting with whitespace, dot, or uppercase letters.
+# - Remove line containing ## no-doc.
+# - Remove after colon if the line is not a comment line.
+# - Replace /^## / to " ".
+# - Remove other comment lines.
+# - Insert newline before rules.
+ @sed -e '/^\s*$$/d; /^[ .A-Z]/d; /## no-doc/d; s/^\([^#][^:]*\):.*/\1/;
s/^## / /; /^#/d; s/^[^ ]/\n&/' Makefile
+
+all: package
+## Builds the package.
+
+deps:
+## Installs the dependencies.
+ $(CASK) install
+
+$(PACKAGE): $(SRC) deps ## no-doc
+ rm -rf dist
+ $(CASK) package
+
+package: $(PACKAGE)
+## Builds the package.
+
+install: package
+## Installs the package.
+ $(CASK) exec $(EMACS) --batch \
+ -l package \
+ -f package-initialize \
+ -f package-refresh-contents \
+ --eval '(package-install-file "$(PACKAGE)")'
+
+clean:
+## Cleans the dist directory and *.elc.
+ rm -rf dist *.elc
+
+test:
+## Tests the package.
+ $(CASK) exec $(EMACS) --batch -q \
+ --eval "(add-to-list 'load-path \""$(shell readlink -f .)"\")" \
+ --eval "(add-to-list 'load-path \""$(shell readlink -f .)"/test\")" \
+ -f batch-byte-compile \
+ *.el
+ cask exec ert-runner -L . -L test
diff --git a/doc/string.png b/doc/string.png
new file mode 100644
index 0000000000..b8bcc77c67
Binary files /dev/null and b/doc/string.png differ
diff --git a/doc/string.svg b/doc/string.svg
new file mode 100644
index 0000000000..d789f0a361
--- /dev/null
+++ b/doc/string.svg
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="584"
+ height="144"
+ viewBox="0 0 584 144.00001"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="string.svg"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192">
+ <defs
+ id="defs2">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker6705"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6703"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+
style="fill:#ff8000;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker13385"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="Arrow1Mend">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+
style="fill:#ff8000;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path13383"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5763"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path5761"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.6605596"
+ inkscape:cx="275.35731"
+ inkscape:cy="101.86651"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="2152"
+ inkscape:window-height="1924"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ inkscape:bbox-nodes="true"
+ inkscape:pagecheckerboard="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4485"
+ empspacing="8"
+ empcolor="#0000ff"
+ empopacity="0.1254902"
+ color="#0000ff"
+ opacity="0.0627451" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="レイヤー 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-978.51965)">
+ <rect
+
style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ id="rect13915"
+ width="584"
+ height="144"
+ x="0"
+ y="978.51965" />
+ <text
+ id="text4606"
+ y="1075.9337"
+ x="19.000004"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;str
[...]
+ xml:space="preserve"><tspan
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4604"
+ y="1075.9337"
+ x="19.000004"
+ sodipodi:role="line">"The quick brown ${<tspan
+ style="fill:#000000"
+ id="tspan4563">fox()</tspan>} jumps over the lazy ${<tspan
+ style="fill:#000000"
+ id="tspan4566">dog()</tspan>}"</tspan></text>
+ <path
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ d="m 200,1084.5197 c 0,4.4183 -3.58172,8 -8,8 h -80.00005 c -4.41828,0
-7.99995,3.5817 -7.99995,8 m -88.00005,-16 c 0,4.4183 3.581754,8 8.000054,8 H
96 c 4.4182,0 8,3.5817 8,8"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ id="path4633" />
+ <text
+ id="text4637"
+ y="1116.4796"
+ x="70.353432"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="1116.4796"
+ x="70.353432"
+ id="tspan4635"
+ sodipodi:role="line">string chunk</tspan></text>
+ <path
+ id="path4639"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ d="m 248,1056.3897 c 0,-4.4183 -3.58172,-8 -8,-8 h -8.00005 c
-4.41828,0 -7.99995,-3.5818 -7.99995,-8 m -24.00005,16 c 0,-4.4183 3.58175,-8
8.00005,-8 h 8 c 4.4182,0 8,-3.5818 8,-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc" />
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="168.87584"
+ y="1032.2296"
+ id="text4643"><tspan
+ sodipodi:role="line"
+ id="tspan4641"
+ x="168.87584"
+ y="1032.2296">template expression</tspan></text>
+ <path
+ id="path4645"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ d="m 480,1084.5197 c 0,4.4183 -3.58172,8 -8,8 h -96.00005 c -4.41828,0
-7.99995,3.5817 -7.99995,8 m -120.00005,-16 c 0,4.4183 3.58175,8 8.00005,8 h
104 c 4.4182,0 8,3.5817 8,8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ d="m 528,1056.3897 c 0,-4.4183 -3.58172,-8 -8,-8 h -8.00005 c
-4.41828,0 -7.99995,-3.5818 -7.99995,-8 m -24,16 c 0,-4.4183 3.58175,-8
8.00005,-8 h 6.00005 c 4.4182,0 9.9999,-3.5818 9.9999,-8"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ id="path4647" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ d="m 559.99995,1084.5197 c 0,4.4183 -3.58172,8 -8,8 v 0 c -4.41828,0
-7.99995,3.5817 -7.99995,8 m -14.00005,-16 c 0,4.4183 3.58175,8 8,8 4.41825,0
6.00005,3.5817 6.00005,8"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ id="path4649" />
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="335.02167"
+ y="1116.4796"
+ id="text4653"><tspan
+ sodipodi:role="line"
+ id="tspan4651"
+ x="335.02167"
+ y="1116.4796">string chunk</tspan></text>
+ <text
+ id="text4657"
+ y="1114.0197"
+ x="516.02167"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="1114.0197"
+ x="516.02167"
+ id="tspan4655"
+ sodipodi:role="line">string chunk</tspan></text>
+ <text
+ id="text4661"
+ y="1032.2296"
+ x="449.87582"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="1032.2296"
+ x="449.87582"
+ id="tspan4659"
+ sodipodi:role="line">template expression</tspan></text>
+ <path
+ id="path9031"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ d="m 560,1021.3897 c 0,-4.4183 -3.58172,-8 -8,-8 H 295.99995 c
-4.41828,0 -7.99995,-3.5818 -7.99995,-8 m -272.00005,16 c 0,-4.4183 3.581754,-8
8.000054,-8 H 280 c 4.4182,0 8,-3.5818 8,-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc" />
+ <text
+ id="text9035"
+ y="997.76978"
+ x="255.49001"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="997.76978"
+ x="255.49001"
+ id="tspan9033"
+ sodipodi:role="line">string template</tspan></text>
+ </g>
+</svg>
diff --git a/doc/string_properties.png b/doc/string_properties.png
new file mode 100644
index 0000000000..c7a83810ed
Binary files /dev/null and b/doc/string_properties.png differ
diff --git a/doc/string_properties.svg b/doc/string_properties.svg
new file mode 100644
index 0000000000..abb0c04053
--- /dev/null
+++ b/doc/string_properties.svg
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="510"
+ height="270"
+ viewBox="0 0 510 270.00002"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="string_properties.svg"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192">
+ <defs
+ id="defs2">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5503"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5501"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+
style="fill:#ff8000;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker5494"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="Arrow1Mend">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+
style="fill:#ff8000;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path5492"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker4802"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="Arrow1Mend"
+ inkscape:collect="always">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+
style="fill:#ff8000;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path4800"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker11187"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="Arrow1Mend">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+
style="fill:#ff8000;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path11185"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5763"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path5761"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2"
+ inkscape:cx="221.87375"
+ inkscape:cy="161.89411"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="2152"
+ inkscape:window-height="1924"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ inkscape:bbox-nodes="true"
+ inkscape:pagecheckerboard="true"
+ inkscape:snap-global="false"
+ fit-margin-left="0"
+ fit-margin-top="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4485"
+ empspacing="8"
+ empcolor="#0000ff"
+ empopacity="0.1254902"
+ color="#0000ff"
+ opacity="0.0627451"
+ originx="0"
+ originy="-48.5" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="レイヤー 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-804.01965)">
+ <rect
+
style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ id="rect13915"
+ width="510"
+ height="270"
+ x="0"
+ y="804.01965" />
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;str
[...]
+ x="197"
+ y="846.76184"
+ id="text4615"><tspan
+ sodipodi:role="line"
+ x="197"
+ y="846.76184"
+ id="tspan4613"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1">"""</tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="870.76184"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4617"> The quick brown</tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="894.76184"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4621"> ${</tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="918.76184"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1"
+ id="tspan4625"> fox()</tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="942.76184"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4630"> } </tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="966.76184"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4636"> jumps over the lazy</tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="990.76184"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4652"> <tspan
+ style="fill:#a0522d;fill-opacity:1"
+ id="tspan5601">$dog</tspan></tspan><tspan
+ sodipodi:role="line"
+ x="197"
+ y="1014.7618"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:24px;font-family:'DejaVu
Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono,
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8b2252;fill-opacity:1"
+ id="tspan4654"> """</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="415.44"
+ y="924.72968"
+ id="text4658"><tspan
+ sodipodi:role="line"
+ id="tspan4656"
+ x="415.44"
+ y="924.72968">syntax-multiline t</tspan></text>
+ <text
+ id="text4662"
+ y="816.01965"
+ x="132.69"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="816.01965"
+ x="132.69"
+ id="tspan4660"
+ sodipodi:role="line">syntax-table (15) (generic string
delimiters)</tspan></text>
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path4664"
+ d="m 202,834.51965 v -16"
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="200.85812"
+ y="1034.6997"
+ id="text4668"><tspan
+ sodipodi:role="line"
+ id="tspan4666"
+ x="200.85812"
+ y="1034.6997">syntax-table (15)</tspan></text>
+ <path
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 240,1026.5197 v -16.0001"
+ id="path4670"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="256.85812"
+ y="890.69965"
+ id="text4674"><tspan
+ sodipodi:role="line"
+ id="tspan4672"
+ x="256.85812"
+ y="890.69965">syntax-table (15)</tspan></text>
+ <path
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 232,890.51965 h 21"
+ id="path4676"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path4678"
+ d="m 223,938.51965 h 30.00001"
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 216,984.76965 -20,-3.75"
+ id="path4680"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ id="text4686"
+ y="938.69965"
+ x="256.85812"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="938.69965"
+ x="256.85812"
+ id="tspan4684"
+ sodipodi:role="line">syntax-table (15)</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:12px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="195.37062"
+ y="982.94965"
+ id="text4690"><tspan
+ sodipodi:role="line"
+ id="tspan4688"
+ x="195.37062"
+ y="982.94965"
+
style="text-align:end;text-anchor:end">kotlin-property--interpolation</tspan><tspan
+ sodipodi:role="line"
+ x="195.37062"
+ y="994.94965"
+ id="tspan5599"
+ style="text-align:end;text-anchor:end">(matching-data covering the
identifier)</tspan></text>
+ <path
+ inkscape:connector-curvature="0"
+ id="path5488"
+ d="m 230,899.51965 -8,29"
+
style="fill:none;fill-rule:evenodd;stroke:#ff8000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5494)"
/>
+ <path
+
style="fill:none;fill-rule:evenodd;stroke:#ff8000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4802)"
+ d="m 220,929.06085 0.22166,-30.0824"
+ id="path5490"
+ inkscape:connector-curvature="0" />
+ <text
+ id="text6016"
+ y="900.01965"
+ x="185.26071"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:12px;font-family:Sans;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0080ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+
style="line-height:12px;text-align:end;text-anchor:end;fill:#0080ff;fill-opacity:1"
+ y="900.01965"
+ x="185.26071"
+ sodipodi:role="line"
+ id="tspan6012">kotlin-property--matching-bracket</tspan><tspan
+
style="line-height:12px;text-align:end;text-anchor:end;fill:#0080ff;fill-opacity:1"
+ id="tspan6014"
+ y="912.01965"
+ x="185.26071"
+ sodipodi:role="line">(location of the matching bracket)</tspan></text>
+ <path
+ inkscape:connector-curvature="0"
+ id="path6018"
+ d="m 189.75,894.51965 c 10.07697,-22.41984 32.08788,-21.72824
40.83579,-8.9948"
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6020"
+ d="m 189,906.51965 27,24"
+
style="fill:none;fill-rule:evenodd;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ d="m 397,834.51965 c 4.41828,0 8,3.58172 8,8 v 72.00005 c 0,4.41828
3.58173,7.99995 8,7.99995 m -16,87.50005 c 4.41828,0 8,-3.5817 8,-8 v -71.50005
c 0,-4.4182 3.58173,-8 8,-8"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0080ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+ id="path6022" />
+ <text
+ id="text6026"
+ y="1059.6997"
+ x="68.690002"
+
style="font-style:normal;font-weight:normal;font-size:10px;line-height:25px;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ y="1059.6997"
+ x="68.690002"
+ id="tspan6024"
+ sodipodi:role="line">Those properties are put by
syntax-propertize-function (kotlin-mode--syntax-propertize).</tspan></text>
+ </g>
+</svg>
diff --git a/kotlin-mode-lexer.el b/kotlin-mode-lexer.el
new file mode 100644
index 0000000000..29576be8e7
--- /dev/null
+++ b/kotlin-mode-lexer.el
@@ -0,0 +1,362 @@
+;;; kotlin-mode-lexer.el --- Major mode for kotlin, lexer -*- lexical-binding:
t; -*-
+
+;; Copyright © 2019 taku0
+
+;; Author: taku0 (http://github.com/taku0)
+;; Keywords: languages
+;; Package-Requires: ((emacs "24.3"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Lexical level routines.
+
+;;; Code:
+
+(require 'rx)
+(require 'cl-lib)
+(require 'eieio)
+
+;; Terminology:
+;; https://kotlinlang.org/docs/reference/basic-types.html#string-templates
+;; See also doc/string.png.
+;;
+;; String template:
+;; A string containing expressions to be evaluated and inserted into the
+;; string at run time.
+;; Example: "1 + 1 = ${1 + 1}" is evaluated to "1 + 1 = 2" at run time.
+;;
+;; Template expression:
+;; An expression between ${ and } inside a string.
+;; Suppose a string "aaa${ foo() }bbb${ bar() }ccc",
+;; `foo()' and `bar()' are template expressions.
+;;
+;; String chunk:
+;; A part of single-line/multiline string delimited with quotation marks
+;; or template expressions.
+;; Suppose a string "aaa${ foo() }bbb${ bar() }ccc",
+;; "aaa${, }bbb${, and }ccc" are string chunks.
+;;
+;; This is not a official term; used only in kotlin-mode.
+
+;;; Text properties
+
+;; See also doc/string_properties.png.
+;;
+;; Some properties are put by `syntax-propertize-function', that is
+;; `kotlin-mode--syntax-propertize'.
+;;
+;; The beginning of and end of strings, character literals, backquoted
+;; identifiers are marked with text property '(syntax-table (15)),
+;; which indicates generic string delimiters. Both single-line
+;; strings and multiline strings are marked with it. The brackets
+;; surrounding template expressions are also marked with
+;; '(syntax-table (15)). The property helps font-lock and the
+;; tokenizer to recognize strings.
+;;
+;; The entire string including template expressions, character
+;; literal, backquoted identifiers are marked with text property
+;; '(syntax-multiline t). The property is used by
+;; `kotlin-mode--syntax-propertize-extend-region' to avoid scanning
+;; from the middle of strings.
+;;
+;; The brackets surrounding template expressions have text property
+;; '(kotlin-property--matching-bracket POS), where POS is the position
+;; of the matching bracket. Strictly speaking, the POS on the closing
+;; bracket refers to the dollar sign before the opening
+;; parenthesis. The property speeds up the indentation logic.
+
+(defun kotlin-mode--syntax-propertize-extend-region (start end)
+ "Return region to be propertized.
+
+The returned region contains the region (START . END).
+If the region is not modified, return nil.
+Intended for `syntax-propertize-extend-region-functions'."
+ (syntax-propertize-multiline start end))
+
+(defun kotlin-mode--syntax-propertize (start end)
+ "Update text properties for strings.
+
+Mark the beginning of and the end of single-line/multiline
+strings, character literals, backquoted identifiers between the
+position START and END as general string delimiters.
+
+Intended for `syntax-propertize-function'."
+ (remove-text-properties start end
+ '(syntax-table
+ nil
+ syntax-multiline
+ nil
+ kotlin-property--matching-bracket
+ nil
+ kotlin-property--interpolation
+ nil))
+ (let* ((chunk (kotlin-mode--chunk-after (syntax-ppss start))))
+ (cond
+ ((kotlin-mode--chunk-multiline-string-p chunk)
+ (kotlin-mode--syntax-propertize-end-of-string end "\"\"\""))
+
+ ((kotlin-mode--chunk-single-line-string-p chunk)
+ (kotlin-mode--syntax-propertize-end-of-string end "\""))
+
+ ((kotlin-mode--chunk-character-literal-p chunk)
+ (kotlin-mode--syntax-propertize-end-of-string end "'"))
+
+ ((kotlin-mode--chunk-backquoted-identifier-p chunk)
+ (kotlin-mode--syntax-propertize-end-of-string end "`"))
+
+ ((kotlin-mode--chunk-comment-p chunk)
+ (goto-char (kotlin-mode--chunk-start chunk))
+ (forward-comment (point-max)))))
+
+ (kotlin-mode--syntax-propertize-scan end 0))
+
+(defun kotlin-mode--syntax-propertize-scan (end nesting-level)
+ "Update text properties for strings.
+
+Mark the beginning of and the end of single-line/multiline
+strings and character literals between the current position and
+END as general string delimiters.
+
+Assuming the cursor is not on strings, character-literal,
+backquoted identifier, nor comments.
+
+If NESTING-LEVEL is non-zero, nesting of brackets are tracked and
+the scan stops where the level becomes zero."
+ (let ((found-matching-bracket nil)
+ (pattern (rx (or "\"\"\"" "\"" "//" "/*" "{" "}" "'" "`"))))
+ (while (and (not found-matching-bracket)
+ (< (point) end)
+ (search-forward-regexp pattern end t))
+ (cond
+ ((member (match-string-no-properties 0) '("\"\"\"" "\"" "'" "`"))
+ (let ((start (match-beginning 0))
+ (quotation (match-string-no-properties 0)))
+ (put-text-property start (1+ start)
+ 'syntax-table
+ (string-to-syntax "|"))
+ (kotlin-mode--syntax-propertize-end-of-string end quotation)
+ (put-text-property start (point) 'syntax-multiline t)
+
+ (when (equal quotation "`")
+ ;; Backquotes cannot be escaped. So declares the backslashes in
+ ;; the identifier are not a escape-syntax characters.
+ (put-text-property (1+ start) (1- (point))
+ 'syntax-table
+ (string-to-syntax "w")))))
+
+ ((equal "//" (match-string-no-properties 0))
+ (goto-char (match-beginning 0))
+ (forward-comment (point-max)))
+
+ ((equal "/*" (match-string-no-properties 0))
+ (goto-char (match-beginning 0))
+ (forward-comment (point-max)))
+
+ ((and (equal "{" (match-string-no-properties 0))
+ (/= nesting-level 0))
+ (setq nesting-level (1+ nesting-level)))
+
+ ((and (equal "}" (match-string-no-properties 0))
+ (/= nesting-level 0))
+ (setq nesting-level (1- nesting-level))
+ (when (= nesting-level 0)
+ (setq found-matching-bracket t)))))
+ (unless found-matching-bracket
+ (goto-char end))
+ found-matching-bracket))
+
+(defun kotlin-mode--syntax-propertize-end-of-string (end quotation)
+ "Move point to the end of single-line/multiline string.
+
+Assuming the cursor is on a string, a character literal, or a backquoted
+identifier.
+If the string go beyond END, stop there.
+The string should be terminated with QUOTATION."
+ (if (and (< (point) end)
+ (search-forward-regexp
+ (rx-to-string
+ `(or ,quotation
+ "${"
+ (and "$" (or
+ (and (char alpha "_") (* (char alnum "_")))
+ (and "`" (+ (not (any "`\n"))) "`")))))
+ end t))
+ (cond
+ ((and (equal quotation (match-string-no-properties 0))
+ (or (equal quotation "`") ; backquotes cannot be escaped
+ (not (kotlin-mode--escaped-p (match-beginning 0)))))
+ (put-text-property (1- (point)) (point)
+ 'syntax-table
+ (string-to-syntax "|")))
+ ((and (equal "${" (match-string-no-properties 0))
+ (member quotation '("\"\"\"" "\""))
+ ;; Dollar signs cannot be escaped, so we don't need to check it.
+ )
+ ;; Found an template expression. Skips the expression.
+ ;; We cannot use `scan-sexps' because multiline strings are not yet
+ ;; propertized.
+ (let ((pos-after-open-bracket (point))
+ (start
+ (save-excursion
+ (backward-char) ;; {
+ (backward-char) ;; $
+ (point))))
+ ;; Declares the open bracket is a generic string delimiter.
+ (put-text-property
+ (1- pos-after-open-bracket) pos-after-open-bracket
+ 'syntax-table
+ (string-to-syntax "|"))
+ (when (kotlin-mode--syntax-propertize-scan end 1)
+ ;; Found the matching bracket. Going further.
+ ;; Declares the close bracket is a generic string delimiter.
+ (put-text-property (1- (point)) (point)
+ 'syntax-table
+ (string-to-syntax "|"))
+ ;; Records the positions.
+ (put-text-property (1- (point)) (point)
+ 'kotlin-property--matching-bracket
+ start)
+ (put-text-property start pos-after-open-bracket
+ 'kotlin-property--matching-bracket
+ (1- (point)))
+ (kotlin-mode--syntax-propertize-end-of-string end quotation))))
+ ((match-string-no-properties 0)
+ (put-text-property (match-beginning 0) (1+ (match-beginning 0))
+ 'kotlin-property--interpolation
+ (match-data))
+ (kotlin-mode--syntax-propertize-end-of-string end quotation))
+ (t
+ (kotlin-mode--syntax-propertize-end-of-string end quotation)))
+ (goto-char end)))
+
+(defun kotlin-mode--escaped-p (position)
+ "Return t if the POSITION in a string is escaped.
+
+A position is escaped if it is proceeded by odd number of backslashes.
+Return nil otherwise."
+ (let ((p position)
+ (backslash-count 0))
+ (while (eq (char-before p) ?\\)
+ (setq backslash-count (1+ backslash-count))
+ (setq p (1- p)))
+ (= (mod backslash-count 2) 1)))
+
+
+;;; Comment or string chunks
+
+(defclass kotlin-mode--chunk ()
+ ((type :initarg :type
+ :type symbol
+ :accessor kotlin-mode--chunk-type
+ :documentation "The type of the chunk.
+
+Valid values:
+- single-line-string
+- multiline-string
+- single-line-comment
+- multiline-comment
+- character-literal
+- backquoted-identifier")
+ (start :initarg :start
+ :type number
+ :accessor kotlin-mode--chunk-start
+ :documentation "The start position of the chunk."))
+ "String-chunks, comments, character literals, or backquoted identifiers.
+
+It have the type and the start position.")
+
+(defun kotlin-mode--chunk-comment-p (chunk)
+ "Return non-nil if the CHUNK is a comment."
+ (and chunk
+ (memq (kotlin-mode--chunk-type chunk)
+ '(single-line-comment multiline-comment))))
+
+(defun kotlin-mode--chunk-string-p (chunk)
+ "Return non-nil if the CHUNK is a string."
+ (and chunk
+ (memq (kotlin-mode--chunk-type chunk)
+ '(single-line-string multiline-string))))
+
+(defun kotlin-mode--chunk-single-line-comment-p (chunk)
+ "Return non-nil if the CHUNK is a single-line comment."
+ (and chunk (eq (kotlin-mode--chunk-type chunk) 'single-line-comment)))
+
+(defun kotlin-mode--chunk-multiline-comment-p (chunk)
+ "Return non-nil if the CHUNK is a multiline comment."
+ (and chunk (eq (kotlin-mode--chunk-type chunk) 'multiline-comment)))
+
+(defun kotlin-mode--chunk-single-line-string-p (chunk)
+ "Return non-nil if the CHUNK is a single-line string."
+ (and chunk (eq (kotlin-mode--chunk-type chunk) 'single-line-string)))
+
+(defun kotlin-mode--chunk-multiline-string-p (chunk)
+ "Return non-nil if the CHUNK is a multiline string."
+ (and chunk (eq (kotlin-mode--chunk-type chunk) 'multiline-string)))
+
+(defun kotlin-mode--chunk-character-literal-p (chunk)
+ "Return non-nil if the CHUNK is a character literal."
+ (and chunk (eq (kotlin-mode--chunk-type chunk) 'character-literal)))
+
+(defun kotlin-mode--chunk-backquoted-identifier-p (chunk)
+ "Return non-nil if the CHUNK is a backquoted identifier."
+ (and chunk (eq (kotlin-mode--chunk-type chunk) 'backquoted-identifier)))
+
+(defun kotlin-mode--chunk-after (&optional parser-state)
+ "Return the chunk at the cursor.
+
+If the cursor is outside of strings and comments, return nil.
+
+If PARSER-STATE is given, it is used instead of (syntax-ppss)."
+ (save-excursion
+ (when (number-or-marker-p parser-state)
+ (goto-char parser-state))
+ (when (or (null parser-state) (number-or-marker-p parser-state))
+ (setq parser-state (save-excursion (syntax-ppss parser-state))))
+ (cond
+ ((nth 3 parser-state)
+ ;; Syntax category "|" is attached to both single-line and multiline
+ ;; string delimiters. So (nth 3 parser-state) may be t even for
+ ;; single-line string delimiters.
+ (if (save-excursion (goto-char (nth 8 parser-state))
+ (looking-at "\"\"\""))
+ (make-instance 'kotlin-mode--chunk
+ :type 'multiline-string
+ :start (nth 8 parser-state))
+ (make-instance 'kotlin-mode--chunk
+ :type 'single-line-string
+ :start (nth 8 parser-state))))
+ ((eq (nth 4 parser-state) t)
+ (make-instance 'kotlin-mode--chunk
+ :type 'single-line-comment
+ :start (nth 8 parser-state)))
+ ((nth 4 parser-state)
+ (make-instance 'kotlin-mode--chunk
+ :type 'multiline-comment
+ :start (nth 8 parser-state)))
+ ((and (eq (char-before) ?/) (eq (char-after) ?/))
+ (make-instance 'kotlin-mode--chunk
+ :type 'single-line-comment
+ :start (1- (point))))
+ ((and (eq (char-before) ?/) (eq (char-after) ?*))
+ (make-instance 'kotlin-mode--chunk
+ :type 'multiline-comment
+ :start (1- (point))))
+ (t
+ nil))))
+
+(provide 'kotlin-mode-lexer)
+
+;;; kotlin-mode-lexer.el ends here
diff --git a/kotlin-mode.el b/kotlin-mode.el
index e5a4b1c41b..6b715a5b4d 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -3,6 +3,7 @@
;; Copyright © 2015 Shodai Yokoyama
;; Author: Shodai Yokoyama (quantumcars@gmail.com)
+;; Version: 2.0.0
;; Keywords: languages
;; Package-Requires: ((emacs "24.3"))
@@ -28,12 +29,16 @@
(require 'comint)
(require 'rx)
(require 'cc-cmds)
+(require 'cl-lib)
+(require 'eieio)
+
+(require 'kotlin-mode-lexer)
(defgroup kotlin nil
"A Kotlin major mode."
:group 'languages)
-(defcustom kotlin-tab-width tab-width
+(defcustom kotlin-tab-width 4
"The tab width to use for indentation."
:type 'integer
:group 'kotlin-mode
@@ -80,11 +85,11 @@
(kotlin-do-and-repl-focus 'kotlin-send-buffer))
(defun kotlin-send-block ()
+ "Send block to Kotlin interpreter."
(interactive)
- (let* ((p (point)))
+ (save-mark-and-excursion
(mark-paragraph)
- (kotlin-send-region (region-beginning) (region-end))
- (goto-char p)))
+ (kotlin-send-region (region-beginning) (region-end))))
(defun kotlin-send-block-and-focus ()
"Send block to Kotlin interpreter and switch to it."
@@ -128,7 +133,6 @@
(define-key map (kbd "C-c C-r") 'kotlin-send-region)
(define-key map (kbd "C-c C-c") 'kotlin-send-block)
(define-key map (kbd "C-c C-b") 'kotlin-send-buffer)
- (define-key map (kbd "<tab>") 'c-indent-line-or-region)
map)
"Keymap for kotlin-mode")
@@ -137,16 +141,21 @@
;; Strings
(modify-syntax-entry ?\" "\"" st)
+ (modify-syntax-entry ?\' "\"" st)
+ (modify-syntax-entry ?` "\"" st)
- ;; `_' as being a valid part of a word
- (modify-syntax-entry ?_ "w" st)
+ ;; `_' and `@' as being a valid part of a symbol
+ (modify-syntax-entry ?_ "_" st)
+ (modify-syntax-entry ?@ "_" st)
;; b-style comment
(modify-syntax-entry ?/ ". 124b" st)
- (modify-syntax-entry ?* ". 23" st)
+ (modify-syntax-entry ?* ". 23n" st)
(modify-syntax-entry ?\n "> b" st)
+ (modify-syntax-entry ?\r "> b" st)
st))
+(defconst kotlin-mode--closing-brackets '(?} ?\) ?\]))
;;; Font Lock
@@ -154,7 +163,7 @@
'("package" "import"))
(defconst kotlin-mode--type-decl-keywords
- '("nested" "inner" "data" "class" "interface" "trait" "typealias" "enum"
"object"))
+ '("sealed" "inner" "data" "class" "interface" "trait" "typealias" "enum"
"object"))
(defconst kotlin-mode--fun-decl-keywords
'("fun"))
@@ -173,7 +182,10 @@
"when" "is" "in" "as" "return"))
(defconst kotlin-mode--context-variables-keywords
- '("this" "super"))
+ '("field" "it" "this" "super"))
+
+(defconst kotlin-mode--generic-type-parameter-keywords
+ '("where"))
(defvar kotlin-mode--keywords
(append kotlin-mode--misc-keywords
@@ -181,7 +193,8 @@
kotlin-mode--fun-decl-keywords
kotlin-mode--val-decl-keywords
kotlin-mode--statement-keywords
- kotlin-mode--context-variables-keywords)
+ kotlin-mode--context-variables-keywords
+ kotlin-mode--generic-type-parameter-keywords)
"Keywords used in Kotlin language.")
(defconst kotlin-mode--constants-keywords
@@ -190,19 +203,28 @@
(defconst kotlin-mode--modifier-keywords
'("open" "private" "protected" "public" "lateinit"
"override" "abstract" "final" "companion"
- "annotation" "internal" "const" "in" "out")) ;; "in" "out"
+ "annotation" "internal" "const" "in" "out"
+ "actual" "expect" "crossinline" "inline" "noinline" "external"
+ "infix" "operator" "reified" "suspend" "tailrec" "vararg"))
(defconst kotlin-mode--property-keywords
- '("by")) ;; "by" "get" "set"
+ '("by" "get" "set")) ;; "by" "get" "set"
(defconst kotlin-mode--initializer-keywords
'("init" "constructor"))
+(defconst kotlin-mode--annotation-use-site-target-keywords
+ '("delegate" "field" "file" "get" "param" "property" "receiver" "set"
+ "setparam"))
+
+(defconst kotlin-mode--type-keywords
+ '("dynamic"))
+
(defvar kotlin-mode--font-lock-keywords
`(;; Keywords
(,(rx-to-string
- `(and bow (group (or ,@kotlin-mode--keywords)) eow)
- t)
+ `(and bow (group (or ,@kotlin-mode--keywords)) eow)
+ t)
1 font-lock-keyword-face)
;; Package names
@@ -214,15 +236,20 @@
;; Types
(,(rx-to-string
- `(and bow upper (group (* (or word "<" ">" "." "?" "!" "*"))))
- t)
+ `(and bow upper (group (* (or word "<" ">" "." "?" "!" "*"))))
+ t)
+ 0 font-lock-type-face)
+
+ (,(rx-to-string
+ `(and bow (or ,@kotlin-mode--type-keywords) eow)
+ t)
0 font-lock-type-face)
;; Classes/Enums
(,(rx-to-string
- `(and bow (or ,@kotlin-mode--type-decl-keywords) eow (+ space)
- (group (+ word)) eow)
- t)
+ `(and bow (or ,@kotlin-mode--type-decl-keywords) eow (+ space)
+ (group (+ word)) eow)
+ t)
1 font-lock-type-face)
;; Constants
@@ -235,7 +262,7 @@
(,(rx-to-string
`(and bow (or ,@kotlin-mode--val-decl-keywords) eow
(+ space)
- (group (+ word)) (* space) (\? ":"))
+ (group (+ (or word (syntax symbol)))) (* space) (\? ":"))
t)
1 font-lock-variable-name-face t)
@@ -257,11 +284,11 @@
;; Properties
;; by/get/set are valid identifiers being used as variable
- ;; TODO: Highlight keywords in the property declaration statement
- ;; (,(rx-to-string
- ;; `(and bow (group (or ,@kotlin-mode--property-keywords)) eow)
- ;; t)
- ;; 1 font-lock-keyword-face)
+ ;; TODO: Highlight only within the property declaration statement
+ (,(rx-to-string
+ `(and bow (group (or ,@kotlin-mode--property-keywords)) eow)
+ t)
+ 1 font-lock-keyword-face)
;; Constructor/Initializer blocks
(,(rx-to-string
@@ -269,45 +296,30 @@
t)
1 font-lock-keyword-face)
+ ;; Annotation use-site targets
+ (,(rx-to-string
+ `(and "@"
+ (group (or ,@kotlin-mode--annotation-use-site-target-keywords))
+ eow)
+ t)
+ 1 font-lock-keyword-face)
+
+ ;; Labels
+ (,(rx-to-string
+ `(and bow (group (+ word)) "@")
+ t)
+ 1 font-lock-constant-face)
+
;; String interpolation
(kotlin-mode--match-interpolation 0 font-lock-variable-name-face t))
"Default highlighting expression for `kotlin-mode'")
-(defun kotlin-mode--new-font-lock-keywords ()
- '(
- ("package\\|import" . font-lock-keyword-face)
- ))
-
-(defun kotlin-mode--syntax-propertize-interpolation ()
- (let* ((pos (match-beginning 0))
- (context (save-excursion
- (save-match-data (syntax-ppss pos)))))
- (when (nth 3 context)
- (put-text-property pos
- (1+ pos)
- 'kotlin-property--interpolation
- (match-data)))))
-
-(defun kotlin-mode--syntax-propertize-function (start end)
- (let ((case-fold-search))
- (goto-char start)
- (remove-text-properties start end '(kotlin-property--interpolation))
- (funcall
- (syntax-propertize-rules
- ((let ((identifier '(or
- (and alpha (* alnum))
- (and "`" (+ (not (any "`\n"))) "`"))))
- (rx-to-string
- `(or (group "${" ,identifier "}")
- (group "$" ,identifier))))
- (0 (ignore (kotlin-mode--syntax-propertize-interpolation)))))
- start end)))
-
(defun kotlin-mode--match-interpolation (limit)
- (let ((pos (next-single-char-property-change (point)
- 'kotlin-property--interpolation
- nil
- limit)))
+ (let ((pos (next-single-char-property-change
+ (point)
+ 'kotlin-property--interpolation
+ nil
+ limit)))
(when (and pos (> pos (point)))
(goto-char pos)
(let ((value (get-text-property pos 'kotlin-property--interpolation)))
@@ -324,8 +336,130 @@
(while (and (looking-at "^[ \t]*$") (not (bobp)))
(forward-line -1)))))
+(defun kotlin-mode--prev-line-begins (pattern)
+ "Return whether the previous line begins with the given pattern"
+ (save-excursion
+ (kotlin-mode--prev-line)
+ (looking-at (format "^[ \t]*%s" pattern))))
+
+(defun kotlin-mode--prev-line-ends (pattern)
+ "Return whether the previous line ends with the given pattern"
+ (save-excursion
+ (kotlin-mode--prev-line)
+ (looking-at (format ".*%s[ \t]*$" pattern))))
+
+(defun kotlin-mode--line-begins (pattern)
+ "Return whether the current line begins with the given pattern"
+ (save-excursion
+ (beginning-of-line)
+ (looking-at (format "^[ \t]*%s" pattern))))
+
+(defun kotlin-mode--line-ends (pattern)
+ "Return whether the current line ends with the given pattern"
+ (save-excursion
+ (beginning-of-line)
+ (looking-at (format ".*%s[ \t]*$" pattern))))
+
+(defun kotlin-mode--line-contains (pattern)
+ "Return whether the current line contains the given pattern"
+ (save-excursion
+ (beginning-of-line)
+ (looking-at (format ".*%s.*" pattern))))
+
+(defun kotlin-mode--line-continuation()
+ "Return whether this line continues a statement in the previous line"
+ (or
+ (and (kotlin-mode--prev-line-begins "\\(if\\|for\\|while\\)[ \t]+(")
+ (kotlin-mode--prev-line-ends ")[[:space:]]*\\(\/\/.*\\|\\/\\*.*\\)?"))
+ (and (kotlin-mode--prev-line-begins "else[ \t]*")
+ (not (kotlin-mode--prev-line-begins "else [ \t]*->"))
+ (not (kotlin-mode--prev-line-ends "{.*")))
+ (or
+ (kotlin-mode--line-begins
"\\([.=:]\\|->\\|\\(\\(private\\|public\\|protected\\|internal\\)[
\t]*\\)?[sg]et\\b\\)"))))
+
+(defun kotlin-mode--in-comment-block ()
+ "Return whether the cursor is within a standard comment block structure
+ of the following format:
+ /**
+ * Description here
+ */"
+ (save-excursion
+ (let ((in-comment-block nil)
+ (keep-going (and
+ (not (kotlin-mode--line-begins "\\*\\*+/"))
+ (not (kotlin-mode--line-begins "/\\*"))
+ (nth 4 (syntax-ppss)))))
+ (while keep-going
+ (kotlin-mode--prev-line)
+ (cond
+ ((kotlin-mode--line-begins "/\\*")
+ (setq keep-going nil)
+ (setq in-comment-block t))
+ ((bobp)
+ (setq keep-going nil))
+ ((kotlin-mode--line-contains "\\*/")
+ (setq keep-going nil))))
+ in-comment-block)))
+
+(defun kotlin-mode--first-line-p ()
+ "Determine if point is on the first line."
+ (save-excursion
+ (beginning-of-line)
+ (bobp)
+ )
+ )
+
+(defun kotlin-mode--line-closes-block-p ()
+ "Return whether or not the start of the line closes its containing block."
+ (save-excursion
+ (back-to-indentation)
+ (memq (following-char) kotlin-mode--closing-brackets)
+ ))
+
+(defun kotlin-mode--get-opening-char-indentation (parser-state-index)
+ "Determine the indentation of the line that starts the current block.
+
+Caller must pass in PARSER-STATE-INDEX, which refers to the index
+of the list returned by `syntax-ppss'.
+
+If it does not exist, will return nil."
+ (save-excursion
+ (back-to-indentation)
+ (let ((opening-pos (nth parser-state-index (syntax-ppss))))
+ (when opening-pos
+ (goto-char opening-pos)
+ (current-indentation)))
+ )
+ )
+
+(defun kotlin-mode--indent-for-continuation ()
+ "Return the expected indentation for a continuation."
+ (kotlin-mode--prev-line)
+ (if (kotlin-mode--line-continuation)
+ (kotlin-mode--indent-for-continuation)
+ (+ kotlin-tab-width (current-indentation)))
+ )
+
+(defun kotlin-mode--indent-for-code ()
+ "Return the level that this line of code should be indented to."
+ (let ((indent-opening-block (kotlin-mode--get-opening-char-indentation 1)))
+ (cond
+ ((kotlin-mode--line-continuation) (save-excursion
(kotlin-mode--indent-for-continuation)))
+ ((booleanp indent-opening-block) 0)
+ ((kotlin-mode--line-closes-block-p) indent-opening-block)
+ (t (+ indent-opening-block kotlin-tab-width)))
+ ))
+
+(defun kotlin-mode--indent-for-comment ()
+ "Return the level that this line of comment should be indented to."
+ (let ((opening-indentation (kotlin-mode--get-opening-char-indentation 8)))
+ (if opening-indentation
+ (1+ opening-indentation)
+ 0)
+ ))
+
(defun kotlin-mode--indent-line ()
- "Indent current line as kotlin code"
+ "Indent the current line of Kotlin code."
(interactive)
(let ((follow-indentation-p
(and (<= (line-beginning-position) (point))
@@ -410,7 +544,11 @@
"Major mode for editing Kotlin."
(setq font-lock-defaults '((kotlin-mode--font-lock-keywords) nil nil))
- (setq-local syntax-propertize-function
#'kotlin-mode--syntax-propertize-function)
+ (setq-local parse-sexp-lookup-properties t)
+ (add-hook 'syntax-propertize-extend-region-functions
+ #'kotlin-mode--syntax-propertize-extend-region
+ nil t)
+ (setq-local syntax-propertize-function #'kotlin-mode--syntax-propertize)
(set (make-local-variable 'comment-start) "//")
(set (make-local-variable 'comment-padding) 1)
(set (make-local-variable 'comment-start-skip) "\\(//+\\|/\\*+\\)\\s *")
diff --git a/test/kotlin-mode-test.el b/test/kotlin-mode-test.el
index c75137cd3b..9749006f2f 100644
--- a/test/kotlin-mode-test.el
+++ b/test/kotlin-mode-test.el
@@ -1,6 +1,4 @@
-(load-file "kotlin-mode.el")
-
-;(require 'kotlin-mode)
+(require 'kotlin-mode)
(ert-deftest kotlin-mode--top-level-indent-test ()
(with-temp-buffer
@@ -11,24 +9,28 @@ import foo.Bar
import bar.Bar as bBar
"))
(insert text)
- (beginning-of-buffer)
- (kotlin-mode--indent-line)
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+ (kotlin-mode--indent-line)
(should (equal text (buffer-string)))
- (next-line)
+ (forward-line)
(kotlin-mode--indent-line)
(should (equal text (buffer-string)))
- (next-line)
+ (forward-line)
(kotlin-mode--indent-line)
(should (equal text (buffer-string)))
- (next-line)
+ (forward-line)
(kotlin-mode--indent-line)
(should (equal text (buffer-string)))
- (next-line)
+ (forward-line)
(kotlin-mode--indent-line)
(should (equal text (buffer-string))))))
@@ -39,36 +41,165 @@ return a + b
}"))
(insert text)
- (beginning-of-buffer)
- (next-line)
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+ (forward-line)
(kotlin-mode--indent-line)
(should (equal (buffer-string) "fun sum(a: Int, b: Int): Int {
- return a + b
+ return a + b
}")))))
-;; (ert-deftest kotlin-mode--chained-methods ()
-;; (with-temp-buffer
-;; (let ((text "names.filter { it.empty }
-;; .sortedBy { it }
-;; .map { it.toUpperCase() }
-;; .forEach { print(it) }"))
+(ert-deftest kotlin-mode--lambda-body-indent-test ()
+ (with-temp-buffer
+ (let ((text "fun test(args: Array<String>) {
+args.forEach(arg ->
+println(arg)
+)
+"))
+ (insert text)
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (forward-line)
+ (kotlin-mode--indent-line)
+
+ (should (equal (buffer-string) "fun test(args: Array<String>) {
+ args.forEach(arg ->
+ println(arg)
+ )
+"))
+ )))
+
+(ert-deftest kotlin-mode--chained-methods ()
+ (with-temp-buffer
+ (let ((text "names.filter { it.empty }
+.sortedBy { it }
+.map { it.toUpperCase() }
+.forEach { print(it) }"))
+
+ (insert text)
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+
+ (kotlin-mode--indent-line)
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+
+ (should (equal (buffer-string) "names.filter { it.empty }
+ .sortedBy { it }
+ .map { it.toUpperCase() }
+ .forEach { print(it) }")))))
+
+(ert-deftest kotlin-mode--ignore-comment-test ()
+ (with-temp-buffer
+ (let ((text "fun foo {
+ bar()
+ // }
+ bar()
+}"))
+ (pop-to-buffer (current-buffer))
+ (insert text)
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
+
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string))))))
-;; (insert text)
-;; (beginning-of-buffer)
+(ert-deftest kotlin-mode--indent-comment-at-bob--test ()
+ (with-temp-buffer
+ (let ((text "/*
+ *
+ *
+ */"))
+ (pop-to-buffer (current-buffer))
+ (insert text)
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
-;; (kotlin-mode--indent-line)
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
-;; (next-line)
-;; (kotlin-mode--indent-line)
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string)))
-;; (next-line)
-;; (kotlin-mode--indent-line)
+ (forward-line)
+ (kotlin-mode--indent-line)
+ (should (equal text (buffer-string))))))
-;; (next-line)
-;; (kotlin-mode--indent-line)
+(defun next-non-empty-line ()
+ "Moves to the next non-empty line"
+ (forward-line)
+ (while (and (looking-at "^[ \t]*$") (not (eobp)))
+ (forward-line)))
-;; (should (equal (buffer-string) "names.filter { it.empty }
-;; .sortedBy { it }
-;; .map { it.toUpperCase() }
-;; .forEach { print(it) }")))))
\ No newline at end of file
+(ert-deftest kotlin-mode--sample-test ()
+ (with-temp-buffer
+ (insert-file-contents "test/sample.kt")
+ (goto-char (point-min))
+ (kotlin-mode)
+ (setq-local indent-tabs-mode nil)
+ (setq-local tab-width 4)
+ (setq-local kotlin-tab-width 4)
+ (while (not (eobp))
+ (let ((expected-line (thing-at-point 'line)))
+
+ ;; Remove existing indentation
+ (beginning-of-line)
+ (delete-region (point) (progn (skip-chars-forward " \t") (point)))
+
+ ;; Indent the line
+ (kotlin-mode--indent-line)
+
+ ;; Check that the correct indentation is re-applied
+ (should (equal expected-line (thing-at-point 'line)))
+
+ ;; Go to the next non-empty line
+ (next-non-empty-line)))))
diff --git a/test/sample.kt b/test/sample.kt
index 069c879711..7dd47b5eee 100644
--- a/test/sample.kt
+++ b/test/sample.kt
@@ -6,9 +6,14 @@ import bar.Bar as bBar
// a single line comment
-/*
-* a multiline comment
-*/
+/**
+ * a multiline comment
+ */
+
+/****************************************************************
+ Multiline comment
+ without leading "*"
+****************************************************************/
fun sum(a: Int, b: Int): Int {
return a + b
@@ -21,7 +26,18 @@ fun printSum(a: Int, b: Int): Unit {
}
fun printSum(a: Int, b: Int) {
- print(a + b)
+ val veryLongResultVariableName: Int
+ = (a + b)
+ print(veryLongResultVariableName)
+}
+
+fun functionMultiLineArgs(
+ first: Int,
+ second: Int,
+ third: Int,
+ fourth: Int
+) {
+ print("(${first}, ${second}, ${third}, ${fourth})")
}
val a: Int = 1
@@ -40,9 +56,9 @@ fun main(args: Array<String>) {
fun max(a: Int, b: Int): Int {
if (a > b)
- return a
+ return a
else
- return b
+ return b
}
fun max(a: Int, b: Int) = if (a > b) a else b
@@ -67,16 +83,16 @@ fun getStringLength(obj: Any): Int? {
fun main(args: Array<String>) {
for (arg in args)
- print(arg)
+ print(arg)
}
for (i in args.indices)
-print(args[i])
+ print(args[i])
fun main(args: Array<String>) {
var i = 0
while (i < args.size)
- print(args[i++])
+ print(args[i++])
}
fun cases(obj: Any) {
@@ -90,29 +106,29 @@ fun cases(obj: Any) {
}
if (x in 1..y-1)
-print("OK")
+ print("OK")
if (x !in 0..array.lastIndex)
-print("Out")
+ print("Out")
for (x in 1..5)
-print(x)
+ print(x)
for (name in names)
-println(name)
+ println(name)
if (text in names) // names.contains(text) is called
-print("Yes")
+ print("Yes")
names.filter { it.startsWith("A") }
- .sortedBy { it }
- .map { it.toUpperCase() }
- .forEach { print(it) }
+ .sortedBy { it }
+ .map { it.toUpperCase() }
+ .forEach { print(it) }
fun f() {
things.f()
- .g()
- .h()
+ .g()
+ .h()
}
data class Customer(val name: String, val email: String)
@@ -191,18 +207,19 @@ class Turtle {
}
val myTurtle = Turtle()
-with(myTurtle) { //draw a 100 pix square
-penDown()
-for(i in 1..4) {
- forward(100.0)
- turn(90.0)
-}
-penUp()
+with(myTurtle) {
+ //draw a 100 pix square
+ penDown()
+ for(i in 1..4) {
+ forward(100.0)
+ turn(90.0)
+ }
+ penUp()
}
val stream = Files.newInputStream(Paths.get("/some/file.txt"))
-stream.buffered().reader().use { reader ->
- println(reader.readText())
+stream.buffered().reader().use {
+ reader -> println(reader.readText())
}
inline fun <reified T: Any> Gson.fromJson(json): T = this.fromJson(json,
T::class.java)
@@ -210,7 +227,7 @@ inline fun <reified T: Any> Gson.fromJson(json): T =
this.fromJson(json, T::clas
loop@ for (i in 1..100) {
for (j in 1..100) {
if (x)
- break@loop
+ break@loop
}
}
@@ -287,7 +304,9 @@ class Derived() : Base() {
override fun v() {}
}
-open class AnotherDerived() : Base() {
+open class AnotherDerived()
+ : Base()
+{
final override fun v() {}
}
@@ -310,7 +329,7 @@ interface B {
}
class C() : A(), B {
- // The compiler requires f() to be overridden:
+ // The compiler requires f() to be overridden
override fun f() {
super<A>.f() // call to A.f()
super<B>.f() // call to B.f()
@@ -339,25 +358,25 @@ fun eval(expr: Expr): Double = when(expr) {
}
var stringRepresentation: String
-get() = this.toString()
-set(value) {
- setDataFromString(value) // parses the string and assigns values to other
properties
-}
+ get() = this.toString()
+ set(value) {
+ setDataFromString(value) // parses the string and assigns values to
other properties
+ }
var setterVisibility: String = "abc"
-private set // the setter is private and has the default implementation
+ private set // the setter is private and has the default implementation
var setterWithAnnotation: Any? = null
@Inject set // annotate the setter with Inject
var counter = 0 // the initializer value is written directly to the backing
field
-set(value) {
- if (value >= 0)
- field = value
-}
+ set(value) {
+ if (value >= 0)
+ field = value
+ }
val isEmpty: Boolean
-get() = this.size == 0
+ get() = this.size == 0
const val SUBSYSTEM_DEPRECATED: String = "This subsystem is deprecated"
@@ -392,7 +411,7 @@ interface MyInterface {
val property: Int // abstract
val propertyWithImplementation: String
- get() = "foo"
+ get() = "foo"
fun foo() {
print(property)
@@ -427,7 +446,7 @@ class D : A, B {
private fun foo() {} // visible inside example.kt
public var bar: Int = 5 // property is visible everywhere
-private set // setter is visible only in example.kt
+ private set // setter is visible only in example.kt
internal val baz = 6 // visible inside the same module
@@ -462,7 +481,7 @@ fun Any?.toString(): String {
}
val <T> List<T>.lastIndex: Int
-get() = size - 1
+ get() = size - 1
class MyClass {
companion object { } // will be called "Companion"
@@ -563,15 +582,17 @@ enum class ProtocolState {
abstract fun signal(): ProtocolState
}
-window.addMouseListener(object : MouseAdapter() {
- override fun mouseClicked(e: MouseEvent) {
- // ...
- }
+window.addMouseListener(
+ object : MouseAdapter() {
+ override fun mouseClicked(e: MouseEvent) {
+ // ...
+ }
- override fun mouseEntered(e: MouseEvent) {
- // ...
+ override fun mouseEntered(e: MouseEvent) {
+ // ...
+ }
}
-})
+)
val adHoc = object {
var x: Int = 0
@@ -583,15 +604,17 @@ fun countClicks(window: JComponent) {
var clickCount = 0
var enterCount = 0
- window.addMouseListener(object : MouseAdapter() {
- override fun mouseClicked(e: MouseEvent) {
- clickCount++
- }
+ window.addMouseListener(
+ object : MouseAdapter() {
+ override fun mouseClicked(e: MouseEvent) {
+ clickCount++
+ }
- override fun mouseEntered(e: MouseEvent) {
- enterCount++
+ override fun mouseEntered(e: MouseEvent) {
+ enterCount++
+ }
}
- })
+ )
// ...
}
@@ -629,12 +652,12 @@ infix fun Int.shl(x: Int): Int {
fun <T> asList(vararg ts: T): List<T> {
val result = ArrayList<T>()
for (t in ts) // ts is an Array
- result.add(t)
+ result.add(t)
return result
}
tailrec fun findFixPoint(x: Double = 1.0): Double
-= if (x == Math.cos(x)) x else findFixPoint(Math.cos(x))
+ = if (x == Math.cos(x)) x else findFixPoint(Math.cos(x))
fun <T> lock(lock: Lock, body: () -> T): T {
lock.lock()
@@ -651,7 +674,7 @@ val result = lock(lock, ::toBeSynchronized)
fun <T, R> List<T>.map(transform: (T) -> R): List<R> {
val result = arrayListOf<R>()
for (item in this)
- result.add(transform(item))
+ result.add(transform(item))
return result
}
@@ -659,13 +682,14 @@ val doubled = ints.map { it -> it * 2 }
strings.filter { it.length == 5 }.sortBy { it }.map { it.toUpperCase() }
-max(strings, { a, b -> a.length < b.length })
+max(strings, { a, b -> a.length < b.length
+})
fun <T> max(collection: Collection<T>, less: (T, T) -> Boolean): T? {
var max: T? = null
for (it in collection)
- if (max == null || less(max, it))
- max = it
+ if (max == null || less(max, it))
+ max = it
return max
}
@@ -707,8 +731,14 @@ inline fun <reified T> TreeNode.findParentOfType(): T? {
}
class Test {
- fun f() {
-
+ fun tryAdd(a: Int?, b: Int?) : Int? {
+ var result: Int? = null
+ a?.let { lhs ->
+ b?.let { rhs ->
+ result = lhs + rhs
+ }
+ }
+ return result
}
}
@@ -718,3 +748,4 @@ fun itpl() {
print("${foo}bar");
print("${`weird$! identifier`}bar");
}
+