diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52b0334..05ff480 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,25 +2,22 @@
π First off, thanks for taking the time to contribute! π
-> **Note**: if you are here because you want to submit a port/learn how to port Catppuccin to a program please refer to the [documentation](https://github.com/catppuccin/catppuccin/blob/main/docs/contributing.md)
-
## Guidelines
-The following is a set of guidelines for contributing to this project. Use your best judgment, and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to this repository. Use your best judgment, and feel free to propose
+changes to this document in a pull request.
-- PRs should go to the `dev` branch. Reasons:
- - If there is already stuff under development, then it's likely that a conflict may occur.
- - Releases/Deployment.
- - Documentation tends not to be updated by PRs.
- - Testing.
-- Use the `.editorconfig` file (located at the root of this project) on your editor so as to "maintain consistent coding styles". For instructions on how to use this file refer to [EditorConfig's website](https://editorconfig.org/).
+- Use the `.editorconfig` file (located at the root of this project) on your editor to "maintain consistent coding
+ styles." For instructions on how to use this file refer to [EditorConfig's website](https://editorconfig.org/).
## Recommendations
-- Create a topic branch on your fork for your specific PR.
-- Consider using [conventionalcommits.org's](https://www.conventionalcommits.org/en/v1.0.0/) rules for creating explicit and meaningful commit messages.
-- If it's your first time contributing to a project then read [About pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) on Github's docs.
-
-## License
-
-Any contribution will be published under the same licensing terms as the project itself.
+- Create a [topic branch](git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) on your fork for your
+ specific PR.
+- Consider using [conventionalcommits.org](https://www.conventionalcommits.org/en/v1.0.0/)'s rules for creating explicit
+ and meaningful commit messages.
+- If it's your first time contributing to a project then you should look to the
+ popular [first-contributions](https://github.com/firstcontributions/first-contributions) repository on GitHub. This
+ will give you hands-on experience with the features of GitHub required to make a contribution. As always, feel free to
+ join our [Discord](https://discord.com/invite/r6Mdz5dpFc) to ask any questions and clarify your understanding, we are
+ more than happy to help!
diff --git a/README.md b/README.md
index d161504..ff0a1b6 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
-Catppuccin is a community-driven pastel theme that aims to be the middle ground between low and high contrast themes. It consists of 4 soothing warm palettes with 26 eye-candy colors each, perfect for coding, designing, and much more! In addition, this repository tracks the development of the actual color palette, the project's documentation, organization-wide assets, resources and code samples for maintainers/developers.
+Catppuccin is a community-driven pastel theme that aims to be the middle ground between low and high contrast themes. It consists of 4 soothing warm flavors with 26 eye-candy colors each, perfect for coding, designing, and much more! In addition, this repository tracks the development of the actual color palette, the project's documentation, organization-wide assets, resources and code samples for maintainers/developers.
-Catppuccin is a community-driven pastel theme that aims to be the middle ground between low and high contrast themes. It consists of 4 soothing warms palette with 26 eye-candy colors each, perfect for coding, designing, and much more! In addition, this repository tracks the development of the actual color palette, organization-wide assets, resources and code samples for maintainers/developers.
+Catppuccin is a community-driven pastel theme that aims to be the middle ground between low and high contrast themes. It consists of 4 soothing warm flavors with 26 eye-candy colors each, perfect for coding, designing, and much more! In addition, this repository tracks the development of the actual color palette, organization-wide assets, resources and code samples for maintainers/developers.
@@ -20,10 +20,9 @@ Catppuccin is a community-driven pastel theme that aims to be the middle ground
### πͺ΄ Index
-+ [Specifications](https://github.com/catppuccin/catppuccin/blob/main/docs/specs.md): properties of the palettes
-+ [Integrating](https://github.com/catppuccin/catppuccin/blob/main/docs/integration.md): how to implement Catppuccin in your own projects
-+ [Style Guide](https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md): a guide on how to properly use the palettes
-+ [Contributing](https://github.com/catppuccin/catppuccin/blob/main/docs/contributing.md): creating Catppuccin ports
++ [Specifications](https://github.com/catppuccin/catppuccin/blob/main/docs/specs.md): properties of the palette
++ [Style Guide](https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md): a guide on how to properly use the palette
++ [Port Creation](https://github.com/catppuccin/catppuccin/blob/main/docs/port-creation.md): creating Catppuccin ports
diff --git a/docs/contributing.md b/docs/contributing.md
deleted file mode 100644
index 2fa964a..0000000
--- a/docs/contributing.md
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
π€ Contributing
-
-
-
- Creating Catppuccin ports
-
-
-
-
-### What's a port?
-
-A port is basically an adaptation of Catppuccin's palettes for an app to use. Think of it as a colorscheme for a program that styles every UI component it consists of!
-
-
-
-### Creation
-
-You can create ports using [this](https://github.com/catppuccin/template) public template as a blueprint. However, you must **not** create it the traditional way (by clicking **Use this template**), because this leaves a _small_ tag under the repos' name that says `generated from `. To avoid this, follow the instructions below:
-
-1. Create the repo and leave it empty:
-```
-mkdir name_of_your_port
-cd name_of_your_port
-git init
-```
-
-2. Add this template as a remote:
-```
-git remote add template https://github.com/catppuccin/template.git
-```
-
-3. Pull from it:
-```
-git pull template main
-```
-
-4. Delete the remote:
-```
-git remote remove template
-```
-
-5. Make the template its own repository by running
-```
-git reset $(git commit-tree HEAD^{tree} -m "feat: initial commit")
-```
-
-6. Set up the rest of your port, and push it to your user repository!
-
-
-
-### Styling!
-
-Although you just created the repo successfully, it's important to style it properly to ensure consistency:
-
-- The name of the repo must be the simplest version of the app's name (e.g `nvim` instead of `NeoVim`). You may use hyphens if needed (e.g. `windows-files`).
-- Put the images under `assets/`. If there are a bunch of them consider [creating an empty branch](https://gist.github.com/joncardasis/e6494afd538a400722545163eb2e1fa5) (e.g. `assets`) and storing them there.
-- Format the repo's description as "`` Soothing pastel theme for ``".
- - `` should be an emoji that you feel represents the app best.
- - `` is the name of the app, capitalized properly.
-- Add `catppuccin` to the topics.
-- Ensure uppercase meta files (e.g. `README.md`)
-- Don't add health files (e.g. `CODE_OF_CONDUCTS.md`, `SUPPORT.md`), those are organization-wide files stored [here](https://github.com/catppuccin/.github).
-
-
-
-### Tools
-
-Since Catppuccin is available in 4 palettes it's understandable that it may not be quite as easy to make 4 versions of a port. So to help with that, we have built a bunch of tools to make life easier when creating Catppuccin ports. You'll find them all (with instructions) under our [catppuccin/toolbox](https://github.com/catppuccin/toolbox) repo. Particularly, for the initial problem stated, you'd want to take a look at the [Puccinier](https://github.com/catppuccin/toolbox#%EF%B8%8F-puccinier) tool.
-
-
-
-### Submission
-
-Raise a discussion under main repository [here!](https://github.com/catppuccin/catppuccin/discussions/new?category=port-requests)
-The title should be the **simplest** name of the application/tool/website in **lower-kebab-case** that you are wanting ported over.
-E.g. **NeoVim** -> **neovim**
-
-If you have already created a repository containing the work, make sure to include it within the description for others to see! Feel free to join our [Discord](https://discord.com/invite/r6Mdz5dpFc) and share it there too!
-
-The discussion will be transferred to an issue once the [staff team](https://github.com/orgs/catppuccin/teams/staff/members)
-have deemed the port ready to be reviewed and merged!
diff --git a/docs/integration.md b/docs/integration.md
deleted file mode 100644
index a876a15..0000000
--- a/docs/integration.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
π¦ Integration
-
-
-
- How to implement Catppuccin in your own projects
-
-
-
-
-### How to
-
-Catppuccin comes in many formats to cover a wide range of project types and tech stacks. Its palettes have especially been designed for UI elements and code syntax highlighting often found in projects build with web technologies like websites; hence why we have a dedicated repository for storing the various formats and presentation of the palettes: [catppuccin/palette](https://github.com/catppuccin/palette).
-
-
-
-### Web Development
-
-Since Catppuccin is heavily used in web technology based projects, it's main installation method is therefore npm, the Node.js package manager.
-Install and add it as production dependency by running `npm` from the command line:
-
-```
-npm install --save @catppuccin/palette
-```
-
-
-
-### Graphical Design
-
-Color swatches are simply a palette showing a variety of shades of the same color. Here, Catppuccin has various "swatches" in different formats to be used in software ranging from Adobe Products to graphical design apps such as Figma and InkScape. You can find them under [catppuccin/palette](https://github.com/catppuccin/palette).
diff --git a/docs/port-creation.md b/docs/port-creation.md
new file mode 100644
index 0000000..1c81345
--- /dev/null
+++ b/docs/port-creation.md
@@ -0,0 +1,96 @@
+
+
𧱠Port Creation
+
+
+
+ Guidelines for submitting and creating ports
+
+
+
+
+### What's a port?
+
+A port is an adaptation of Catppuccin's palette for an app to use. Think of it as a colorscheme for a program
+that styles every UI component it consists of!
+
+
+
+### Submission
+
+Raise a discussion under main
+repository [here!](https://github.com/catppuccin/catppuccin/discussions/new?category=port-requests) The title should be
+the **simplest** name of the application/tool/website/etc that you are wanting ported over.
+
+If you have already created a repository containing the work, make sure to include it within the description for others
+to see! Feel free to join our [Discord](https://discord.com/invite/r6Mdz5dpFc) and share it there too!
+
+The discussion will be transferred to an issue by
+the [staff team](https://github.com/orgs/catppuccin/teams/staff/members) once we have deemed the port ready to be
+reviewed and merged!
+
+All ports should conform to our [CODE OF CONDUCT](https://github.com/catppuccin/.github/blob/main/CODE_OF_CONDUCT.md)
+and we, the staff team, reserve the right to choose what ports will be included under the organisation. As a
+community-driven project, we want to keep a neutral environment for all users. Therefore, **we do not accept
+contributions that have a religious or political context.** However, we have no issue with our palette being used in
+these contexts.
+
+
+
+### Creation
+
+You can create ports using [this](https://github.com/catppuccin/template) public template as a blueprint.
+
+1. Clone template repository
+
+ ```
+ git clone https://github.com/catppuccin/template.git
+ ```
+
+2. Navigate into the cloned repository
+
+ ```
+ cd
+ ```
+
+3. Delete the existing remote
+
+ ```
+ git remote remove origin
+ ```
+
+4. Set up the rest of your port, and push it to your user repository!
+
+
+
+### Licensing
+
+Any contribution will be published under the same licensing terms as the project itself. However, there
+are [exceptions to this rule](https://github.com/search?q=org%3Acatppuccin+-license%3Amit). Please get in touch with us
+if that is the case with your work!
+
+
+
+### Styling!
+
+After creating the repo successfully, it's important to style it properly to ensure consistency:
+
+- The name of the repo must be the simplest version of the app's name (e.g. `nvim` instead of `NeoVim`). You may use
+ hyphens if needed (e.g. `windows-files`).
+- Put the images under `assets/`.
+- Format the repo's description as "`` Soothing pastel theme for ``".
+ - `` should be an emoji that you feel represents the app best.
+ - `` is the name of the app, capitalized properly.
+- Add `catppuccin`, and `theme` to the topics.
+- Ensure uppercase meta files (e.g. `README.md`)
+- Don't add health files (e.g. `CODE_OF_CONDUCT.md`, `SUPPORT.md`), those are organization-wide files
+ stored [here](https://github.com/catppuccin/.github).
+
+
+
+### Tools
+
+Since Catppuccin is available in 4 flavors it's understandable that it may be difficult to make 4 versions of a
+port. So to help with that, we have built a bunch of tools to make life easier when creating Catppuccin ports. You'll
+find them all (with instructions) under our [catppuccin/toolbox](https://github.com/catppuccin/toolbox) repo.
+An essential tool for creating ports is [catwalk](https://github.com/catppuccin/toolbox#catwalk), this is used to create
+a layered screenshot of your port which combines all four flavors into one.
diff --git a/docs/specs.md b/docs/specs.md
index 79d4805..1ed005a 100644
--- a/docs/specs.md
+++ b/docs/specs.md
@@ -3,20 +3,25 @@
- Properties of the palettes
+ Properties of the palette
- "GNU/Linux and the family of operating systems made from the GNU
- system, developed by the same project, introduced the Linux
- kernel. It is one of the most well-known examples of free
- software and open source software: according to proprietary
- operating systems such as Windows and Mac OS, all source code is
- available to the public and the world can freely use, change and
- redistribute."
-
-
-
-
-
-
+
+
+
+
+ IntelliJ IDEA
+
+
+
IntelliJ IDEA
+
+ What is IntelliJ IDEA? · Α
+ hello
+
diff --git a/samples/java.java b/samples/java.java
index 2dfae5f..4da86aa 100644
--- a/samples/java.java
+++ b/samples/java.java
@@ -1,77 +1,66 @@
-package project1.ui;
+/* Block comment */
-import static project1.umethods.SleepTime.*;
-import static project1.umethods.ScreenManipulation.*;
+import java.util.Date;
-import java.util.Scanner;
-import project1.ui.PatientMenu;
-import project1.ui.DoctorMenu;
-import project1.ui.authentication.AuthenticationMenu;
-
-enum Months { //"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
- JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE,
- JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER
-}
+import static AnInterface.CONSTANT;
+import static java.util.Date.parse;
+import static SomeClass.staticField;
/**
- * UIMenu
+ * Doc comment here for SomeClass
+ *
+ * @param T type parameter
+ * @see Math#sin(double)
*/
-public class UIMenu {
+@Annotation(name = value)
+public class SomeClass { // some comment
+ private T field = null;
+ private double unusedField = 12345.67890;
+ private UnknownType anotherString = "Another\nStrin\g";
+ public static int staticField = 0;
+ public final int instanceFinalField = 0;
+ protected final int protectedField = 0;
+ final int packagePrivateField = 0;
- //months is not a var, is a constant becuase of `final`
- public static final int year = 2021;
+ /**
+ * Semantic highlighting:
+ * Generated spectrum to pick colors for local variables and parameters:
+ * Color#1 SC1.1 SC1.2 SC1.3 SC1.4 Color#2 SC2.1 SC2.2 SC2.3 SC2.4 Color#3
+ * Color#3 SC3.1 SC3.2 SC3.3 SC3.4 Color#4 SC4.1 SC4.2 SC4.3 SC4.4 Color#5
+ *
+ * @param param1
+ * @param param2
+ * @param param3
+ */
+ public SomeClass(AnInterface param1,
+ int param2,
+ int param3) {
+ int reassignedValue = this.staticField + param2 + param3;
+ long localVar1, localVar2, localVar3, localVar4;
+ int localVar = "IntelliJ"; // Error, incompatible types
+ System.out.println(anotherString + toString() + localVar);
+ int sum = protectedField + packagePrivateField + staticField;
+ long time = parse("1.2.3"); // Method is deprecated
+ new Thread().countStackFrames(); // Method is deprecated and marked for removal
+ reassignedValue++;
+ field.run();
+ new SomeClass() {
+ {
+ int a = localVar;
+ }
+ };
+ int[] l = new ArrayList().toArray(new int[CONSTANT]);
+ }
+}
- public static void showMenu(){
- Scanner keyboard = new Scanner(System.in);
- int uResponse = 0;
- String test = "";
+enum AnEnum {CONST1, CONST2}
- do {
- System.out.printf("\t----Menu----\n\n");
- int time = 50;
- sleepText("1) Doctors", time); sleepText("2) Patient", time); sleepText("0) Exit", time);
- System.out.printf("\nType here π ");
+interface AnInterface {
+ int CONSTANT = 2;
- do {
- try {
- try {
- test = keyboard.nextLine(); //receive whatever input
- if (test.isEmpty()) {
- throw new NullPointerException("var is empty");
- } else {
- sleepFor(500);
- uResponse = Integer.parseInt(test); //parse that input into an Integer (not an int)
- break;
- }
- } catch(NullPointerException e) {
- System.out.printf("\nRemember you must type at least ony number from 0-2\n"); showMenu();
- }
- } catch (NumberFormatException e) {
- //TODO: handle exception
- clearScreen();
- System.out.printf("\n\nERROR (β): this program only accepts integers\n\n");
- showMenu();
- }
- } while (true);
+ void method();
+}
- switch (uResponse) {
- case 0:
- System.out.printf("Goodbye! Hope I helped!\n");
- System.exit(0);
- break;
- case 1:
- clearScreen();
- if (AuthenticationMenu.startAuthMenu(1) == true) { DoctorMenu.showDoctorMenu(); } else { System.out.printf("Something went wrong :)\n"); }
- break;
- case 2:
- clearScreen();
- if (AuthenticationMenu.startAuthMenu(2) == true) { PatientMenu.showPatientMenu(); } else { System.out.printf("Something went wrong :)\n"); }
- //PatientMenu.showPatientMenu();
- break;
- default:
- System.out.print("\033[H\033[2J"); System.out.flush();
- System.out.printf("ERROR (β): command not recognized\ntry again β\n");
- }
- } while (uResponse != 0);
- }
+abstract class SomeAbstractClass {
+ protected int instanceField = staticField;
}
diff --git a/samples/javascript.js b/samples/javascript.js
new file mode 100644
index 0000000..92cb71b
--- /dev/null
+++ b/samples/javascript.js
@@ -0,0 +1,33 @@
+var globalVar;
+
+/**
+ * Constructor for AjaxRequest class
+ * @param {string} url the url for the request
+ */
+function AjaxRequest(url) {
+ function local() {}
+ var urls = [ "www.cnn.com", 5, globalVar];
+ this.request = new XMLHttpRequest();
+ url = url.replace(/^\s*(.*)/, "$1"); // skip leading whitespace
+ /* check the url to be in urls */
+ var a = "\u1111\z\n\u11";
+ this.foo = new function() {};
+ foo();
+ #
+ var hello = () => console.log("hello")
+}
+
+@decorator()
+class NameClass {
+}
+
+declare module name{
+ declare export var exportedVar: string;
+ declare export function exportedFunction(): void;
+ declare export class ExportedClass {}
+}
+
+interface MyInterface { }
+type FooBarAlias = string;
+var html =`
Injected language fragment
`;
+var x: MyInterface, y: string, z: FooBarAlias;
diff --git a/samples/javascript/0.js b/samples/javascript/0.js
deleted file mode 100644
index 6c89381..0000000
--- a/samples/javascript/0.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const Generator = require("yeoman-generator")
-const chalk = require('chalk')
-const yosay = require("yosay")
-
-module.exports = class extends Generator {
- prompting() {
- // have yeoman greet the user
- this.log(chalk.red("Let\'s do this"))
-
- const prompts = [{
- message: 'Enter the excercise title',
- worker: true,
- action: null,
- age: 123
- }];
-
- return this.prompt(prompts).then(props => {
- // you can access them later
- this.props = props
- })
- }
-}
-
-function exclamate(message) {
- return message + "!"
-}
-
-console.log(exclamate("lol"))
diff --git a/samples/javascript/1.js b/samples/javascript/1.js
deleted file mode 100644
index bb2f015..0000000
--- a/samples/javascript/1.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import { SET_TOKEN } from "./authTypes";
-
-function isJson(str) {
- try {
- JSON.parse(str);
- } catch (e) {
- //the json is not ok
- return false;
- }
- //the json is ok
- return true;
-}
-
-export const login = async (data, dispatchToken) => {
- const requestOptions = {
- method: "POST",
- headers: {
- Accept: "application/json",
- "Content-Type": "application/json",
- },
- body: JSON.stringify(data),
- };
-
- try {
- const response = await fetch(
- `http://127.0.0.1:8000/api/token`,
- requestOptions
- );
-
- if (response.ok) {
- const res = await response.json();
- window.localStorage.setItem("userToken", res.token);
- dispatchToken({ type: SET_TOKEN, token: res.token });
- return {
- ok: true,
- successMessage: "Login Successfull.",
- errors: null,
- };
- } else {
- const res = await response.json();
- return {
- ok: false,
- successMessage: null,
- errors: { password: res.errors["non_field_errors"] },
- };
- }
- } catch (error) {
- alert(error);
- }
-};
-
-export const register = async (data, dispatchToken) => {
- const requestOptions = {
- method: "POST",
- headers: {
- Accept: "application/json",
- "Content-Type": "application/json",
- },
- body: JSON.stringify(data),
- };
-
- try {
- const response = await fetch(
- `http://127.0.0.1:8000/api/register`,
- requestOptions
- );
-
- if (response.ok) {
- const res = await response.json();
- window.localStorage.setItem("userToken", res.token);
- dispatchToken({ type: SET_TOKEN, token: res.token });
- return {
- ok: true,
- successMessage: "Register Successfull.",
- errors: null,
- };
- } else {
- const res = await response.json();
- return {
- ok: false,
- successMessage: null,
- errors: res["errors"],
- };
- }
- } catch (error) {
- alert(error);
- }
-};
diff --git a/samples/json.json b/samples/json.json
index a396764..2628633 100644
--- a/samples/json.json
+++ b/samples/json.json
@@ -1,24 +1,19 @@
{
- "name": "Catppuccin",
- "version": "1.0.0",
- "description": "JSON sample",
- "main": "readme.md",
- "scripts": {
- "gulp": "gulp"
- },
- "devDependencies": {
- "gulp": "^4.0.2",
- "browser-sync": "^2.27.5",
- "gulp-sass": "^5.0.0",
- "gulp-uglify-es": "^2.0.0",
- "sass": "^1.35.1"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/catppuccin/catppuccin"
- },
- "keywords": ["gulp", "pugjs", "sass", "coffeescript", "template"],
- "author": "John Doe",
- "license": "MIT",
- "homepage": "https://github.com/catppuccin"
+ // Line comments are not included in standard but nonetheless allowed.
+ /* As well as block comments. */
+ "the only keywords are": [
+ true,
+ false,
+ null
+ ],
+ "strings with": {
+ "no escapes": "pseudopolinomiality"
+ "valid escapes": "C-style\r\n and unicode\u0021",
+ "illegal escapes": "\0377\x\"
+ },
+ "some numbers": [
+ 42,
+ -0.0e-0,
+ 6.626e-34
+ ]
}
diff --git a/samples/kotlin.kt b/samples/kotlin.kt
new file mode 100644
index 0000000..6dbb829
--- /dev/null
+++ b/samples/kotlin.kt
@@ -0,0 +1,68 @@
+/* Block comment */
+package hello
+
+import kotlin.collections.* // line comment
+
+/**
+ * Doc comment here for `SomeClass`
+ * @see Iterator#next()
+ */
+@Deprecated(message = "Deprecated class")
+private class MyClass>(var prop1: Int) {
+ fun foo(nullable: String?, r: Runnable, f: () -> Int, fl: FunctionLike, dyn: dynamic) {
+ println("length\nis ${nullable?.length} \e")
+ println(nullable!!.length)
+ val ints = java.util.ArrayList(2)
+ ints[0] = 102 + f() + fl()
+ val myFun = { -> "" };
+ var ref = ints.size
+ ints.lastIndex + globalCounter
+ ints.forEach lit@{
+ if (it == null) return@lit
+ println(it + ref)
+ }
+ dyn.dynamicCall()
+ dyn.dynamicProp = 5
+ val klass = MyClass::class
+ val year = java.time.LocalDate.now().year
+ }
+
+ override fun hashCode(): Int {
+ return super.hashCode() * 31
+ }
+}
+
+fun Int?.bar() {
+ if (this != null) {
+ println(message = toString())
+ } else {
+ println(this.toString())
+ }
+}
+
+var globalCounter: Int = 5
+ get() = field
+
+abstract class Abstract {
+ val bar get() = 1
+ fun test() {
+ bar
+ }
+}
+
+object Obj
+
+enum class E { A, B }
+
+interface FunctionLike {
+ operator fun invoke() = 1
+}
+
+typealias Predicate = (T) -> Boolean
+
+fun baz(p: Predicate) = p(42)
+
+suspend fun suspendCall() =
+ suspendFn()
+
+suspend fun suspendFn() {}
diff --git a/samples/lua.lua b/samples/lua.lua
index dd864f9..0ed08f3 100644
--- a/samples/lua.lua
+++ b/samples/lua.lua
@@ -1,41 +1,27 @@
-local M = {}
-
-local api
-local line_text = { here = "hey" }
-local test_tbl = {
- num = 0,
- bool = true,
- str = "aye!",
- something = line_text.here
-}
-
---- @class example
--- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean accumsan dapibus ex,
--- duis tincidunt consectetur nisl at auctor. Mauris et dictum urna, ac maximus mi.
-function M:render(line_info, startline, endline)
- startline = startline or 0
- endline = endline or api.nvim_buf_line_count(self.buffer)
-
- local lines = {}
-
- for index, line in pairs(line_info) do
- local line_no = index
- local column = 1
-
- if #line > 0 then
- for _, segment in ipairs(line) do
- table.insert(self.highlights, {
- range = { line_no, column, #segment.text },
- color_group = segment.color_group,
- })
- end
- end
+---@class Emmy
+local var = {} -- a short comment
+local a, b, c = true, false, nil
+--region my class members region
+
+---@alias MyType Emmy
+
+--- doc comment
+---@param par1 Par1Type @comments
+function var:fun(par1, par2)
+ print('hello')
+ return self.len + 2
+end
- table.insert(lines, line_text)
- end
+---@overload fun(name:string):Emmy
+function var.staticFun()
+end
+--endregion end my class members region
- api.nvim_buf_set_lines(self.buffer, startline, endline, true, lines)
- self:_set_highlights()
+---@return Emmy
+function findEmmy()
+ return "string" .. var
end
-return M
+globalVar = {
+ property = value
+}
diff --git a/samples/markdown.md b/samples/markdown.md
new file mode 100644
index 0000000..b188183
--- /dev/null
+++ b/samples/markdown.md
@@ -0,0 +1,174 @@
+Test Markdown document
+======================
+
+Text
+----
+
+Here is a paragraph with bold text. **This is some bold text.** Here is a
+paragraph with bold text. __This is also some bold text.__
+
+Here is another one with italic text. *This is some italic text.* Here is
+another one with italic text. _This is some italic text._
+
+Here is another one with struckout text. ~~This is some struckout text.~~
+
+
+Links
+-----
+
+Autolink:
+
+Link: [Example](http://example.com)
+
+Reference style [link][1].
+
+[1]: http://example.com "Example"
+
+
+Images
+------
+
+Image: 
+
+Headers
+-------
+
+# First level title
+
+## Second level title
+
+### Third level title
+
+#### Fourth level title
+
+##### Fifth level title
+
+###### Sixth level title
+
+### Title with [link](http://localhost)
+
+### Title with 
+
+Code
+----
+
+```
+This
+ is
+ code
+ fence
+```
+
+Inline `code span in a` paragraph.
+
+This is a code block:
+
+ /**
+ * Sorts the specified array into ascending numerical order.
+ *
+ *
Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+ * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+ * offers O(n log(n)) performance on many data sets that cause other
+ * quicksorts to degrade to quadratic performance, and is typically
+ * faster than traditional (one-pivot) Quicksort implementations.
+ *
+ * @param a the array to be sorted
+ */
+ public static void sort(byte[] a) {
+ DualPivotQuicksort.sort(a);
+ }
+
+Quotes
+------
+
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+> Back to the first level.
+
+
+> A list within a blockquote:
+>
+> * asterisk 1
+> * asterisk 2
+> * asterisk 3
+
+
+> Formatting within a blockquote:
+>
+> ### header
+> Link: [Example](http://example.com)
+
+
+
+Html
+-------
+
+This is inline html.
+And this is an html block.
+
+
+
+
Column 1
+
Column 2
+
+
+
Row 1 Cell 1
+
Row 1 Cell 2
+
+
+
Row 2 Cell 1
+
Row 2 Cell 2
+
+
+
+Horizontal rules
+----------------
+
+---
+
+___
+
+
+***
+
+
+Lists
+-----
+
+Unordered list:
+
+* asterisk 1
+* asterisk 2
+* asterisk 3
+
+Ordered list:
+
+1. First
+2. Second
+3. Third
+
+Mixed:
+
+1. First
+2. Second:
+
+* Fee
+* Fie
+* Foe
+
+3. Third
+
+Definition list:
+
+Some term
+: First definition
+: Second definition
+
+
+Tables:
+
+| Header 1 | Header 2 |
+| -------- | -------- |
+| Data 1 | Data 2 |
diff --git a/samples/python.py b/samples/python.py
index 5666603..ee455ae 100644
--- a/samples/python.py
+++ b/samples/python.py
@@ -1,172 +1,32 @@
-import sys
-import os
-import re
-
-from i18n import _
-
-from importlib.machinery import SourceFileLoader
-
-
-class RubberStamp:
- """Howdy rubber stamp"""
-
- UI_TEXT = "ui_text"
- UI_SUBTEXT = "ui_subtext"
-
- def set_ui_text(self, text, type=None):
- """Convert an ui string to input howdy-gtk understands"""
- typedec = "M"
-
- if type == self.UI_SUBTEXT:
- typedec = "S"
-
- return self.send_ui_raw(typedec + "=" + text)
-
- def send_ui_raw(self, command):
- """Write raw command to howdy-gtk stdin"""
- if self.config.getboolean("debug", "verbose_stamps", fallback=False):
- print("Sending command to howdy-gtk: " + command)
-
- # Add a newline because the ui reads per line
- command += " \n"
- if self.gtk_proc:
- # Send the command as bytes
- self.gtk_proc.stdin.write(bytearray(command.encode("utf-8")))
- self.gtk_proc.stdin.flush()
-
-def execute(config, gtk_proc, opencv):
- verbose = config.getboolean("debug", "verbose_stamps", fallback=False)
- dir_path = os.path.dirname(os.path.realpath(__file__))
- installed_stamps = []
-
- # Go through each file in the rubberstamp folder
- for filename in os.listdir(dir_path):
- # Remove non-readable file or directories
- if not os.path.isfile(dir_path + "/" + filename):
- continue
-
- # Remove meta files
- if filename in ["__init__.py", ".gitignore"]:
- continue
-
- # Add the found file to the list of enabled rubberstamps
- installed_stamps.append(filename.split(".")[0])
-
- if verbose: print("Installed rubberstamps: " + ", ".join(installed_stamps))
-
- # Get the rules defined in the config
- raw_rules = config.get("rubberstamps", "stamp_rules")
- rules = raw_rules.split("\n")
-
- # Go through the rules one by one
- for rule in rules:
- rule = rule.strip()
-
- if len(rule) <= 1:
- continue
-
- # Parse the rule with regex
- regex_result = re.search("^(\w+)\s+([\w\.]+)\s+([a-z]+)(.*)?$", rule, re.IGNORECASE)
-
- # Error out if the regex did not match (invalid line)
- if not regex_result:
- print(_("Error parsing rubberstamp rule: {}").format(rule))
- continue
-
- type = regex_result.group(1)
-
- # Error out if the stamp name in the rule is not a file
- if type not in installed_stamps:
- print(_("Stamp not installed: {}").format(type))
- continue
-
- # Load the module from file
- module = SourceFileLoader(type, dir_path + "/" + type + ".py").load_module()
-
- # Try to get the class with the same name
- try:
- constructor = getattr(module, type)
- except AttributeError:
- print(_("Stamp error: Class {} not found").format(type))
- continue
-
- # Init the class and set common values
- instance = constructor()
- instance.verbose = verbose
- instance.config = config
- instance.gtk_proc = gtk_proc
- instance.opencv = opencv
-
- # Set some opensv shorthands
- instance.video_capture = opencv["video_capture"]
- instance.face_detector = opencv["face_detector"]
- instance.pose_predictor = opencv["pose_predictor"]
- instance.clahe = opencv["clahe"]
-
- # Parse and set the 2 required options for all rubberstamps
- instance.options = {
- "timeout": float(re.sub("[a-zA-Z]", "", regex_result.group(2))),
- "failsafe": regex_result.group(3) != "faildeadly"
- }
-
- # Try to get the class do declare its other config variables
- try:
- instance.declare_config()
- except Exception:
- print(_("Internal error in rubberstamp configuration declaration:"))
-
- import traceback
- traceback.print_exc()
- continue
-
- # Split the optional arguments at the end of the rule by spaces
- raw_options = regex_result.group(4).split()
-
- # For each of those aoptional arguments
- for option in raw_options:
- # Get the key to the left, and the value to the right of the equal sign
- key, value = option.split("=")
-
- # Error out if a key has been set that was not declared by the module before
- if key not in instance.options:
- print("Unknow config option for rubberstamp " + type + ": " + key)
- continue
-
- # Convert the argument string to an int or float if the declared option has that type
- if isinstance(instance.options[key], int):
- value = int(value)
- elif isinstance(instance.options[key], float):
- value = float(value)
-
- instance.options[key] = value
-
- if verbose:
- print("Stamp \"" + type + "\" options parsed:")
- print(instance.options)
- print("Executing stamp")
-
- # Make the stamp fail by default
- result = False
-
- # Run the stamp code
- try:
- result = instance.run()
- except Exception:
- print(_("Internal error in rubberstamp:"))
-
- import traceback
- traceback.print_exc()
- continue
-
- if verbose: print("Stamp \"" + type + "\" returned: " + str(result))
-
- # Abort authentication if the stamp returned false
- if result is False:
- if verbose: print("Authentication aborted by rubber stamp")
- sys.exit(14)
-
- # This is outside the for loop, so we've run all the rules
- if verbose: print("All rubberstamps processed, authentication successful")
-
- # Exit with no errors
- sys.exit(0)
+@decorator(param=1)
+def f(x):
+ """
+ Syntax Highlighting Demo
+ @param x Parameter
+
+ Semantic highlighting:
+ Generated spectrum to pick colors for local variables and parameters:
+ Color#1 SC1.1 SC1.2 SC1.3 SC1.4 Color#2 SC2.1 SC2.2 SC2.3 SC2.4 Color#3
+ Color#3 SC3.1 SC3.2 SC3.3 SC3.4 Color#4 SC4.1 SC4.2 SC4.3 SC4.4 Color#5
+ """
+
+ def nested_func(y):
+ print(y + 1)
+
+ s = ("Test", 2+3, {'a': 'b'}, f'{x!s:{"^10"}}') # Comment
+ f(s[0].lower())
+ nested_func(42)
+
+class Foo:
+ tags: List[str]
+
+ def __init__(self: Foo):
+ byte_string: bytes = b'newline:\n also newline:\x0a'
+ text_string = u"Cyrillic Π― is \u042f. Oops: \u042g"
+ self.make_sense(whatever=1)
+
+ def make_sense(self, whatever):
+ self.sense = whatever
+
+x = len('abc')
+print(f.__doc__)
diff --git a/samples/python1.py b/samples/python1.py
deleted file mode 100644
index d22208f..0000000
--- a/samples/python1.py
+++ /dev/null
@@ -1,815 +0,0 @@
-# source: https://github.com/gornostal/Modific
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-
-import sublime
-import sublime_plugin
-import os
-import threading
-import subprocess
-import functools
-import re
-from copy import copy
-
-IS_ST3 = sublime.version().startswith('3') or sublime.version().startswith('4')
-
-
-def get_settings():
- return sublime.load_settings("Modific.sublime-settings")
-
-
-def get_vcs_settings():
- """
- Returns list of dictionaries
- each dict. represents settings for VCS
- """
-
- default = [
- {"name": "git", "dir": ".git", "cmd": "git"},
- {"name": "svn", "dir": ".svn", "cmd": "svn"},
- {"name": "bzr", "dir": ".bzr", "cmd": "bzr"},
- {"name": "hg", "dir": ".hg", "cmd": "hg"},
- {"name": "tf", "dir": "$tf", "cmd": "C:/Program Files (x86)/Microsoft Visual Studio 11.0/Common7/IDE/TF.exe"}
- ]
- settings = get_settings().get('vcs', default)
-
- # re-format settings array if user has old format of settings
- if type(settings[0]) == list:
- settings = [dict(name=name, cmd=cmd, dir='.'+name) for name, cmd in settings]
-
- return settings
-
-
-def get_user_command(vcs_name):
- """
- Returns command that user specified for vcs_name
- """
-
- try:
- return [vcs['cmd'] for vcs in get_vcs_settings() if vcs.get('name') == vcs_name][0]
- except IndexError:
- return None
-
-
-def tfs_root(directory):
- try:
- tf_cmd = get_user_command('tf') or 'tf'
- command = [tf_cmd, 'workfold', directory]
- p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- shell=True, universal_newlines=False)
- out, err = p.communicate()
- m = re.search(r"^ \$\S+: (\S+)$", out, re.MULTILINE)
- if m:
- return {'root': m.group(1), 'name': 'tf', 'cmd': tf_cmd}
- except:
- return None
-
-
-def get_vcs(directory):
- """
- Determines root directory for VCS and which of VCS systems should be used for a given directory
- Returns dictionary {name: .., root: .., cmd: .., dir: ..}
- """
-
- vcs_check = [(lambda vcs: lambda dir: os.path.exists(os.path.join(dir, vcs.get('dir', False)))
- and vcs)(vcs) for vcs in get_vcs_settings()]
-
- start_directory = directory
- while directory:
- available = list(filter(bool, [check(directory) for check in vcs_check]))
- if available:
- available[0]['root'] = directory
- return available[0]
-
- parent = os.path.realpath(os.path.join(directory, os.path.pardir))
- if parent == directory: # /.. == /
- # try TFS as a last resort
- # I'm not sure why we need to do this. Seems like it should find root for TFS in the main loop
- return tfs_root(start_directory)
- directory = parent
-
- return None
-
-
-def main_thread(callback, *args, **kwargs):
- # sublime.set_timeout gets used to send things onto the main thread
- # most sublime.[something] calls need to be on the main thread
- sublime.set_timeout(functools.partial(callback, *args, **kwargs), 0)
-
-
-def _make_text_safeish(text, fallback_encoding, method='decode'):
- # The unicode decode here is because sublime converts to unicode inside
- # insert in such a way that unknown characters will cause errors, which is
- # distinctly non-ideal... and there's no way to tell what's coming out of
- # git in output. So...
- try:
- unitext = getattr(text, method)('utf-8')
- except (UnicodeEncodeError, UnicodeDecodeError):
- unitext = getattr(text, method)(fallback_encoding)
- except AttributeError:
- # strongly implies we're already unicode, but just in case let's cast
- # to string
- unitext = str(text)
- return unitext
-
-
-def do_when(conditional, callback, *args, **kwargs):
- if conditional():
- return callback(*args, **kwargs)
- sublime.set_timeout(functools.partial(do_when, conditional, callback, *args, **kwargs), 50)
-
-
-def log(*args, **kwargs):
- """
- @param *args: string arguments that should be logged to console
- @param debug=True: debug log mode
- @param settings=None: instance of sublime.Settings
- """
- debug = kwargs.get('debug', True)
- settings = kwargs.get('settings', None)
-
- if not settings:
- settings = get_settings()
-
- if debug and not settings.get('debug', False):
- return
-
- print('Modific:', *args)
-
-
-class CommandThread(threading.Thread):
-
- def __init__(self, command, on_done, working_dir="", fallback_encoding="", console_encoding="", **kwargs):
- threading.Thread.__init__(self)
- self.command = command
- self.on_done = on_done
- self.working_dir = working_dir
- if 'stdin' in kwargs:
- self.stdin = kwargs['stdin'].encode()
- else:
- self.stdin = None
- self.stdout = kwargs.get('stdout', subprocess.PIPE)
- self.console_encoding = console_encoding
- self.fallback_encoding = fallback_encoding
- self.kwargs = kwargs
-
- def run(self):
- try:
- # Per http://bugs.python.org/issue8557 shell=True is required to
- # get $PATH on Windows. Yay portable code.
- shell = os.name == 'nt'
-
- if self.console_encoding:
- self.command = [s.encode(self.console_encoding) for s in self.command]
-
- proc = subprocess.Popen(self.command,
- stdout=self.stdout, stderr=subprocess.STDOUT,
- stdin=subprocess.PIPE,
- cwd=self.working_dir if self.working_dir != '' else None,
- shell=shell, universal_newlines=False)
- output = proc.communicate(self.stdin)[0]
- if not output:
- output = ''
- # if sublime's python gets bumped to 2.7 we can just do:
- # output = subprocess.check_output(self.command)
- main_thread(self.on_done,
- _make_text_safeish(output, self.fallback_encoding), **self.kwargs)
- except subprocess.CalledProcessError as e:
- main_thread(self.on_done, e.returncode)
- except OSError as e:
- if e.errno == 2:
- main_thread(sublime.error_message,
- "'%s' binary could not be found in PATH\n\nConsider using `vcs` property to specify PATH\n\nPATH is: %s" % (self.command[0], os.environ['PATH']))
- else:
- raise e
-
-
-class EditViewCommand(sublime_plugin.TextCommand):
-
- def run(self, edit, command=None, output='', begin=0, region=None):
- """
- For some reason Sublime's view.run_command() doesn't allow to pass tuples,
- therefore region must be a list
- """
- region = sublime.Region(int(region[0]), int(region[1])) if region else None
- if command == 'insert':
- self.view.insert(edit, int(begin), output)
- elif command == 'replace':
- self.view.replace(edit, region, output)
- elif command == 'erase':
- self.view.erase(edit, region)
- else:
- print('Invalid command: ', command)
- raise
-
-
-class VcsCommand(object):
- may_change_files = False
-
- def __init__(self, *args, **kwargs):
- self.settings = get_settings()
- super(VcsCommand, self).__init__(*args, **kwargs)
-
- def log(self, *args, **kwargs):
- return log(settings=self.settings, *args, **kwargs)
-
- def run_command(self, command, callback=None, show_status=False,
- filter_empty_args=True, **kwargs):
- if filter_empty_args:
- command = [arg for arg in command if arg]
- if 'working_dir' not in kwargs:
- kwargs['working_dir'] = self.get_working_dir()
- if 'fallback_encoding' not in kwargs and self.active_view() and self.active_view().settings().get('fallback_encoding'):
- kwargs['fallback_encoding'] = self.active_view().settings().get('fallback_encoding').rpartition('(')[2].rpartition(')')[0]
- kwargs['console_encoding'] = self.settings.get('console_encoding')
-
- autosave = self.settings.get('autosave', True)
- if self.active_view() and self.active_view().is_dirty() and autosave:
- self.active_view().run_command('save')
- if not callback:
- callback = self.generic_done
-
- log('run command:', ' '.join(command))
- thread = CommandThread(command, callback, **kwargs)
- thread.start()
-
- if show_status:
- message = kwargs.get('status_message', False) or ' '.join(command)
- sublime.status_message(message + 'wef')
-
- def generic_done(self, result):
- self.log('generic_done', result)
- if self.may_change_files and self.active_view() and self.active_view().file_name():
- if self.active_view().is_dirty():
- result = "WARNING: Current view is dirty.\n\n"
- else:
- # just asking the current file to be re-opened doesn't do anything
- print("reverting")
- position = self.active_view().viewport_position()
- self.active_view().run_command('revert')
- do_when(lambda: not self.active_view().is_loading(),
- lambda: self.active_view().set_viewport_position(position, False))
-
- if not result.strip():
- return
- self.panel(result)
-
- def _output_to_view(self, output_file, output, clear=False,
- syntax="Packages/Diff/Diff.tmLanguage"):
- output_file.set_syntax_file(syntax)
- if clear:
- output_file.run_command('edit_view', dict(command='replace', region=[0, self.output_view.size()], output=output))
- else:
- output_file.run_command('edit_view', dict(command='insert', output=output))
-
- def scratch(self, output, title=False, position=None, **kwargs):
- scratch_file = self.get_window().new_file()
- if title:
- scratch_file.set_name(title)
- scratch_file.set_scratch(True)
- self._output_to_view(scratch_file, output, **kwargs)
- scratch_file.set_read_only(True)
- if position:
- sublime.set_timeout(lambda: scratch_file.set_viewport_position(position), 0)
- return scratch_file
-
- def panel(self, output, **kwargs):
- if not hasattr(self, 'output_view'):
- self.output_view = self.get_window().get_output_panel("vcs")
- self.output_view.set_read_only(False)
- self._output_to_view(self.output_view, output, clear=True, **kwargs)
- self.output_view.set_read_only(True)
- self.get_window().run_command("show_panel", {"panel": "output.vcs"})
-
- def _active_file_name(self):
- view = self.active_view()
- if view and view.file_name() and len(view.file_name()) > 0:
- return view.file_name()
-
- def active_view(self):
- return self.view
-
- def get_window(self):
- if (hasattr(self, 'view') and hasattr(self.view, 'window')):
- return self.view.window()
- else:
- return sublime.active_window()
-
- def get_working_dir(self):
- return os.path.dirname(self._active_file_name())
-
- def is_enabled(self):
- file_name = self._active_file_name()
- if file_name and os.path.exists(file_name):
- return bool(get_vcs(self.get_working_dir()))
- return False
-
-
-class DiffCommand(VcsCommand):
- """ Here you can define diff commands for your VCS
- method name pattern: %(vcs_name)s_diff_command
- """
-
- def run(self, edit):
- vcs = get_vcs(self.get_working_dir())
- filepath = self.view.file_name()
- filename = os.path.basename(filepath)
- max_file_size = self.settings.get('max_file_size', 1024) * 1024
- if not os.path.exists(filepath) or os.path.getsize(filepath) > max_file_size:
- # skip large files
- return
- get_command = getattr(self, '{0}_diff_command'.format(vcs['name']), None)
- if get_command:
- self.run_command(get_command(filename), self.diff_done)
-
- def diff_done(self, result):
- self.log('diff_done', result)
-
- def git_diff_command(self, file_name):
- vcs_options = self.settings.get('vcs_options', {}).get('git') or ['--no-color', '--no-ext-diff']
- return [get_user_command('git') or 'git', 'diff'] + vcs_options + ['--', file_name]
-
- def svn_diff_command(self, file_name):
- params = [get_user_command('svn') or 'svn', 'diff']
- params.extend(self.settings.get('vcs_options', {}).get('svn', []))
-
- if '--internal-diff' not in params and self.settings.get('svn_use_internal_diff', True):
- params.append('--internal-diff')
-
- # if file starts with @, use `--revision HEAD` option
- # https://github.com/gornostal/Modific/issues/17
- if file_name.find('@') != -1:
- file_name += '@'
- params.extend(['--revision', 'HEAD'])
-
- params.append(file_name)
- return params
-
- def bzr_diff_command(self, file_name):
- vcs_options = self.settings.get('vcs_options', {}).get('bzr', [])
- return [get_user_command('bzr') or 'bzr', 'diff'] + vcs_options + [file_name]
-
- def hg_diff_command(self, file_name):
- vcs_options = self.settings.get('vcs_options', {}).get('hg', [])
- return [get_user_command('hg') or 'hg', 'diff'] + vcs_options + [file_name]
-
- def tf_diff_command(self, file_name):
- vcs_options = self.settings.get('vcs_options', {}).get('tf') or ['-format:unified']
- return [get_user_command('tf') or 'tf', 'diff'] + vcs_options + [file_name]
-
- def get_line_ending(self):
- return '\n'
-
- def join_lines(self, lines):
- """
- Join lines using os.linesep.join(), unless another method is specified in ST settings
- """
- return self.get_line_ending().join(lines)
-
-
-class ShowDiffCommand(DiffCommand, sublime_plugin.TextCommand):
- def diff_done(self, result):
- self.log('on show_diff', result)
-
- if not result.strip():
- return
-
- result = result.replace('\r\n', '\n')
- file_name = re.findall(r'([^\\\/]+)$', self.view.file_name())
- scratch = self.scratch(result, title="Diff - " + file_name[0])
-
- # Select the line in the diff output where the cursor is located.
- point = self.view.sel()[0].b
- region = self.view.line(point)
- line = self.view.substr(region)
-
- region = scratch.find(line, 0, sublime.LITERAL)
- scratch.show_at_center(region)
- scratch.sel().clear()
- # Place the cursor at the beginning of the line
- scratch.sel().add(scratch.line(region).a)
-
-
-class DiffParser(object):
- instance = None
-
- def __init__(self, diff):
- self.diff = diff
- self.chunks = None
- self.__class__.instance = self
-
- def _append_to_chunks(self, start, lines):
- self.chunks.append({
- "start": start,
- "end": start + len(lines),
- "lines": lines
- })
-
- def get_chunks(self):
- if self.chunks is None:
- self.chunks = []
- diff = self.diff.strip()
- if diff:
- re_header = re.compile(r'^@@[0-9\-, ]+\+(\d+)', re.S)
- current = None
- lines = []
- for line in diff.splitlines():
- # ignore lines with '\' at the beginning
- if line.startswith('\\'):
- continue
-
- matches = re.findall(re_header, line)
- if matches:
- if current is not None:
- self._append_to_chunks(current, lines)
- current = int(matches[0])
- lines = []
- elif current:
- lines.append(line)
- if current is not None and lines:
- self._append_to_chunks(current, lines)
-
- return self.chunks
-
- def get_lines_to_hl(self):
- inserted = []
- changed = []
- deleted = []
-
- for chunk in self.get_chunks():
- current = chunk['start']
- deleted_line = None
- for line in chunk['lines']:
- if line.startswith('-'):
- if (not deleted_line or deleted_line not in deleted):
- deleted.append(current)
- deleted_line = current
- elif line.startswith('+'):
- if deleted_line:
- deleted.pop()
- deleted_line = None
- changed.append(current)
- elif current - 1 in changed:
- changed.append(current)
- else:
- inserted.append(current)
- current += 1
- else:
- deleted_line = None
- current += 1
-
- return inserted, changed, deleted
-
- def get_original_part(self, line_num):
- """ returns a chunk of code that relates to the given line
- and was there before modifications
- return (lines list, start_line int, replace_lines int)
- """
-
- # for each chunk from diff:
- for chunk in self.get_chunks():
- # if line_num is within that chunk
- if chunk['start'] <= line_num <= chunk['end']:
- ret_lines = []
- current = chunk['start'] # line number that corresponds to current version of file
- first = None # number of the first line to change
- replace_lines = 0 # number of lines to change
- return_this_lines = False # flag shows whether we can return accumulated lines
- for line in chunk['lines']:
- if line.startswith('-') or line.startswith('+'):
- first = first or current
- if current == line_num:
- return_this_lines = True
- if line.startswith('-'):
- # if line starts with '-' we have previous version
- ret_lines.append(line[1:])
- else:
- # if line starts with '+' we only increment numbers
- replace_lines += 1
- current += 1
- elif return_this_lines:
- break
- else:
- # gap between modifications
- # reset our variables
- current += 1
- first = current
- replace_lines = 0
- ret_lines = []
- if return_this_lines:
- return ret_lines, first, replace_lines
-
- return None, None, None
-
-
-class HlChangesCommand(DiffCommand, sublime_plugin.TextCommand):
- def hl_lines(self, lines, hl_key):
- if (not len(lines) or not self.settings.get('highlight_changes')):
- self.view.erase_regions(hl_key)
- return
-
- icon = self.settings.get('region_icon') or 'modific'
- if icon == 'none':
- return
-
- if icon == 'modific':
- if IS_ST3:
- icon = 'Packages/Modific/icons/' + hl_key + '.png'
- else:
- icon = '../Modific/icons/' + hl_key
- points = [self.view.text_point(l - 1, 0) for l in lines]
- regions = [sublime.Region(p, p) for p in points]
- self.view.add_regions(hl_key, regions, "markup.%s.diff" % hl_key, icon, sublime.HIDDEN | sublime.DRAW_EMPTY)
-
- def diff_done(self, diff):
- self.log('on hl_changes:', diff)
-
- if diff and '@@' not in diff:
- # probably this is an error message
- # if print raise UnicodeEncodeError, try to encode string to utf-8 (issue #35)
- try:
- print(diff)
- except UnicodeEncodeError:
- print(diff.encode('utf-8'))
-
- diff_parser = DiffParser(diff)
- (inserted, changed, deleted) = diff_parser.get_lines_to_hl()
-
- self.log('new lines:', inserted)
- self.log('modified lines:', changed)
- self.log('deleted lines:', deleted)
-
- self.hl_lines(inserted, 'inserted')
- self.hl_lines(deleted, 'deleted')
- self.hl_lines(changed, 'changed')
-
-
-class ShowOriginalPartCommand(DiffCommand, sublime_plugin.TextCommand):
- def run(self, edit):
- diff_parser = DiffParser.instance
- if not diff_parser:
- return
-
- (row, col) = self.view.rowcol(self.view.sel()[0].begin())
- (lines, start, replace_lines) = diff_parser.get_original_part(row + 1)
- if lines is not None:
- self.panel(self.join_lines(lines))
-
-
-class ReplaceModifiedPartCommand(DiffCommand, sublime_plugin.TextCommand):
- def run(self, edit):
- self.view.run_command('save')
-
- diff_parser = DiffParser.instance
- if not diff_parser:
- return
-
- (row, col) = self.view.rowcol(self.view.sel()[0].begin())
- (lines, current, replace_lines) = diff_parser.get_original_part(row + 1)
- if self.settings.get('debug'):
- print('replace', (lines, current, replace_lines))
- if lines is not None:
- begin = self.view.text_point(current - 1, 0)
- content = self.join_lines(lines)
- if replace_lines:
- end = self.view.line(self.view.text_point(replace_lines + current - 2, 0)).end()
- region = sublime.Region(begin, end)
- if lines:
- self.view.run_command('edit_view', dict(command='replace', region=[region.begin(), region.end()], output=content))
- else:
- region = self.view.full_line(region)
- self.view.run_command('edit_view', dict(command='erase', region=[region.begin(), region.end()]))
- else:
- self.view.run_command('edit_view', dict(command='insert', begin=begin,
- output=content + self.get_line_ending()))
- self.view.run_command('save')
-
-
-class HlChangesBackground(sublime_plugin.EventListener):
- def on_load(self, view):
- if not IS_ST3:
- view.run_command('hl_changes')
-
- def on_load_async(self, view):
- view.run_command('hl_changes')
-
- def on_activated(self, view):
- if not IS_ST3:
- view.run_command('hl_changes')
-
- def on_activated_async(self, view):
- view.run_command('hl_changes')
-
- def on_post_save(self, view):
- if not IS_ST3:
- view.run_command('hl_changes')
-
- def on_post_save_async(self, view):
- view.run_command('hl_changes')
-
-
-class JumpBetweenChangesCommand(DiffCommand, sublime_plugin.TextCommand):
- def run(self, edit, direction='next'):
- lines = self._get_lines()
- if not lines:
- return
-
- if direction == 'prev':
- lines.reverse()
-
- (current_line, col) = self.view.rowcol(self.view.sel()[0].begin())
- current_line += 1
- jump_to = None
- for line in lines:
- if direction == 'next' and current_line < line:
- jump_to = line
- break
- if direction == 'prev' and current_line > line:
- jump_to = line
- break
-
- if not jump_to and self.settings.get('jump_between_changes_wraps_around', True):
- jump_to = lines[0]
-
- if jump_to is not None:
- self.goto_line(edit, jump_to)
-
- def goto_line(self, edit, line):
- # Convert from 1 based to a 0 based line number
- line = int(line) - 1
-
- # Negative line numbers count from the end of the buffer
- if line < 0:
- lines, _ = self.view.rowcol(self.view.size())
- line = lines + line + 1
-
- pt = self.view.text_point(line, 0)
-
- self.view.sel().clear()
- self.view.sel().add(sublime.Region(pt))
-
- self.view.show(pt)
-
- def _get_lines(self):
- diff_parser = DiffParser.instance
- if not diff_parser:
- return
-
- (inserted, changed, deleted) = diff_parser.get_lines_to_hl()
- lines = list(set(inserted + changed + deleted))
- lines.sort()
-
- prev = None
- ret_lines = []
- for line in lines:
- if prev != line - 1:
- ret_lines.append(line)
- prev = line
-
- return ret_lines
-
-
-class UncommittedFilesCommand(VcsCommand, sublime_plugin.WindowCommand):
- def active_view(self):
- return self.window.active_view()
-
- def is_enabled(self):
- return bool(self.get_working_dir())
-
- def get_working_dir(self):
- if self._active_file_name():
- working_dir = super(UncommittedFilesCommand, self).get_working_dir()
- if working_dir and get_vcs(working_dir):
- return working_dir
-
- # If the user has opened a vcs folder, use it.
- folders = self.window.folders()
- for folder in folders:
- if folder and os.path.exists(folder) and get_vcs(folder):
- return folder
-
- def run(self):
- self.vcs = get_vcs(self.get_working_dir())
- status_command = getattr(self, '{0}_status_command'.format(self.vcs['name']), None)
- if status_command:
- self.run_command(status_command(), self.status_done, working_dir=self.vcs['root'])
-
- def git_status_command(self):
- return [get_user_command('git') or 'git', 'status', '--porcelain']
-
- def svn_status_command(self):
- return [get_user_command('svn') or 'svn', 'status', '--quiet']
-
- def bzr_status_command(self):
- return [get_user_command('bzr') or 'bzr', 'status', '-S', '--no-pending', '-V']
-
- def hg_status_command(self):
- return [get_user_command('hg') or 'hg', 'status']
-
- def tf_status_command(self):
- return [get_user_command('tf') or 'tf', 'status']
-
- def filter_unified_status(self, result):
- return list(filter(lambda x: len(x) > 0 and not x.lstrip().startswith('>'),
- result.rstrip().replace('"', '').split('\n')))
-
- def git_filter_status(self, result):
- return self.filter_unified_status(result)
-
- def svn_filter_status(self, result):
- return self.filter_unified_status(result)
-
- def bzr_filter_status(self, result):
- return self.filter_unified_status(result)
-
- def hg_filter_status(self, result):
- return self.filter_unified_status(result)
-
- def tf_filter_status(self, result):
- filtered = []
- can_add = False
- for line in result.split('\n'):
- if line.startswith('$'):
- can_add = True
- continue
- if line == '':
- can_add = False
- continue
- if can_add:
- filtered.append(line)
-
- return filtered
-
- def git_status_file(self, file_name):
- # first 2 characters are status codes, the third is a space
- return file_name[3:]
-
- def svn_status_file(self, file_name):
- return file_name[8:]
-
- def bzr_status_file(self, file_name):
- return file_name[4:]
-
- def hg_status_file(self, file_name):
- return file_name[2:]
-
- def tf_status_file(self, file_name):
- try:
- # assume that file name should always contain colon
- return re.findall(r'\s+(\S+:.+)$', file_name)[0]
- except:
- return None
-
- def status_done(self, result):
- filter_status = getattr(self, '{0}_filter_status'.format(self.vcs['name']), None)
-
- self.results = [item.replace('\r', '') for item in filter_status(result)]
-
- if self.results:
- self.show_status_list()
- else:
- sublime.status_message("Nothing to show")
-
- def show_status_list(self):
- options = copy(self.results)
- options.insert(0, " - Open All")
- if self.settings.get('uncommitted_files_use_monospace_font', True):
- self.get_window().show_quick_panel(options, self.panel_done, sublime.MONOSPACE_FONT)
- else:
- self.get_window().show_quick_panel(options, self.panel_done)
-
- def panel_done(self, picked):
- if picked == 0:
- self.open_files(*self.results)
- return
- elif 0 > picked < len(self.results):
- return
- picked_file = self.results[picked - 1]
- self.open_files(picked_file)
-
- def open_files(self, *files):
- for f in files:
- get_file = getattr(self, '{0}_status_file'.format(self.vcs['name']), None)
- if get_file:
- fname = get_file(f)
- if os.path.isfile(os.path.join(self.vcs['root'], fname)):
- self.window.open_file(os.path.join(self.vcs['root'], fname))
- else:
- sublime.status_message("File '{0}' doesn't exist".format(fname))
-
-
-class ToggleHighlightChangesCommand(sublime_plugin.TextCommand):
- def run(self, edit):
- setting_name = "highlight_changes"
- settings = get_settings()
- is_on = settings.get(setting_name)
-
- if is_on:
- # remove highlighting
- [self.view.erase_regions(k) for k in ('inserted', 'changed', 'deleted')]
- else:
- self.view.run_command('hl_changes')
-
- settings.set(setting_name, not is_on)
- sublime.save_settings("Modific.sublime-settings")
diff --git a/samples/python2.py b/samples/python2.py
deleted file mode 100644
index d0d5ef9..0000000
--- a/samples/python2.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Simple Python Sample
-from __future__ import print_function
-
-import os
-import threading
-import sublime
-
-IS_ST3 = sublime.version().startswith('3')
-
-def get_vcs_settings():
- """Returns list of dictionaries"""
- if self.config.getboolean("verbose_stamps", fallback=False):
- print("Sending " + command)
-
- # Add a newline because the ui reads per line
- command += " \n"
- if self.gtk_proc:
- # Send the command as bytes
- self.gtk_proc.stdin.write(bytearray(command.encode("utf-8")))
- self.gtk_proc.stdin.flush()
- try:
- constructor = getattr(module, type)
- except AttributeError:
- print(_("Error: Class {} not found").format(type))
- continue
-
- else
- instance = constructor()
- instance.verbose = verbose
- instance.config = config
-
-def do_when(conditional, callback, *args, **kwargs):
- if conditional():
- return callback(*args, **kwargs)
- sublime.set_timeout(functools.partial(do_when, conditional, callback, *args, **kwargs), 50)
diff --git a/samples/rust.rs b/samples/rust.rs
new file mode 100644
index 0000000..9f53e20
--- /dev/null
+++ b/samples/rust.rs
@@ -0,0 +1,117 @@
+#[macro_use]
+extern crate log;
+
+use std::collections::HashMap;
+use std::rc::Rc;
+
+mod stuff;
+
+pub enum Flag {
+ Good,
+ Bad,
+ Ugly
+}
+
+const QUALITY: Flag = Flag::Good;
+
+struct Table([[i32; N]; N])
+
+pub trait Write {
+ fn write(&mut self, buf: &[u8]) -> Result;
+}
+
+struct Object {
+ flag: Flag,
+ fields: HashMap
+}
+
+union MyUnion {
+ f1: u32,
+ f2: f32,
+}
+
+type RcObject = Rc>;
+
+impl Write for Object {
+ fn write(&mut self, buf: &[u8]) -> Result {
+ let s = stuff::write_map(&self.fields, buf)?;
+ info!("{} byte(s) written", s);
+ Ok(s)
+ }
+}
+
+impl Default for Object {
+ fn default() -> Self {
+ Object { flag: Flag::Good, fields: HashMap::new() }
+ }
+}
+
+macro_rules! make_wrapper {
+ ($wrapper_ty:ident, $base_ty:ty $(, $lu_ty:ty)?) => {
+ pub struct $wrapper_ty($base_ty);
+ impl From<$base_ty> for $wrapper_ty {
+ fn from(base: $base_ty) -> Self {
+ Self(base)
+ }
+ }
+ $(
+ impl From<$lu_ty> for $wrapper_ty {
+ fn from(lu: $lu_ty) -> Self {
+ Self(lu.get())
+ }
+ }
+ impl From<$wrapper_ty> for $lu_ty {
+ fn from(st: $wrapper_ty) -> Self {
+ Self::new(st.0)
+ }
+ }
+ )?
+ }
+}
+
+/* Block comment */
+fn main() {
+ // A simple integer calculator:
+ // `+` or `-` means add or subtract by 1
+ // `*` or `/` means multiply or divide by 2
+ stuff::AppVersion::print();
+
+ let input = Option::None;
+ let program = input.unwrap_or_else(|| "+ + * - /");
+ let mut accumulator = 0;
+
+ for token in program.chars() {
+ match token {
+ '+' => accumulator += 1,
+ '-' => accumulator -= 1,
+ '*' => accumulator *= 2,
+ '/' => accumulator /= 2,
+ _ => { /* ignore everything else */ }
+ }
+ }
+
+ info!("The program \"{}\" calculates the value {}",
+ program, accumulator);
+}
+
+/// Some documentation `with a code`, *an italic text*
+/// and **a bold text**
+/// # Heading
+/// [Rust](https://www.rust-lang.org/)
+#[cfg(target_os="linux")]
+unsafe fn a_function(count: &mut i64) -> ! {
+ count += 1;
+ 'label: loop {
+ let str_with_escapes = "Hello\x20W\u{f3}rld!\u{abcdef}";
+ println!("{} {foo:<4}", str_with_escapes, foo = 42);
+ }
+}
+
+fn test() {
+ unsafe {
+ a_function(1);
+ }
+}
+
+#[cfg(feature = "disabled_feature")]
+fn cfg_disabled_function() {}
diff --git a/samples/rust/0.rs b/samples/rust/0.rs
deleted file mode 100644
index 1bd9226..0000000
--- a/samples/rust/0.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-#![warn(rust_2018_idioms)]
-#![allow(elided_lifetimes_in_paths)]
-
-use std::net::TcpListener;
-use std::io;
-use std::thread::spawn;
-use std::collections::HashMap;
-
-let solar_distance = HashMap::from([
- ("Mercury", 0.4),
- ("Venus", 0.7),
- ("Earth", 1.0),
- ("Mars", 1.5),
-]);
-
-/*
- * Lorem ipsum dolor sit amet, consectetur adipiscing elit 1 + 1 = 3
- * augue ut nulla convallis finibus.
- * */
-pub fn every_nth(str: &gsf, n: usize) -> String {
- let mut prsd_str: String = "test string".to_string().to_owned();
- let lenght:usize = gsf.len();
- for (i, j) in gsf.chars().enumerate() {
- if length%2 == 0 {
- if i%n < n-1 {
- parsed_str.push();
- }
- } else {
- if i%n < n-2 {
- parsed_str.push(gsf.substr(i, j));
- }
- }
- }
- return parsed_str;
-}
-
-fn main(){
- let arr:[i32;4] = [10,20,30,40];
- println!("array is {:?}",arr);
- println!("array size is :{}",arr.len());
-
- for index in 0..4 {
- println!("index is: {} & value is : {}",index,arr[index]);
- }
-}
diff --git a/samples/rust/1.rs b/samples/rust/1.rs
deleted file mode 100644
index ff4fa8c..0000000
--- a/samples/rust/1.rs
+++ /dev/null
@@ -1,961 +0,0 @@
-use crate::context::DrawContext;
-use crate::controller::Controller;
-use crate::font::FontCache;
-use crate::scene::*;
-use crate::wayland::*;
-use crate::*;
-use smithay_client_toolkit::reexports::calloop::{EventLoop, LoopHandle, RegistrationToken};
-use smithay_client_toolkit::seat::keyboard::ModifiersState;
-use smithay_client_toolkit::shm::AutoMemPool;
-use smithay_client_toolkit::WaylandSource;
-
-use std::cell::RefCell;
-use std::ops::{Deref, DerefMut};
-use std::rc::Rc;
-
-use smithay_client_toolkit::reexports::client::{
- global_filter,
- protocol::wl_buffer::WlBuffer,
- protocol::wl_callback,
- protocol::wl_compositor::WlCompositor,
- protocol::wl_output::{self, WlOutput},
- protocol::wl_pointer::{self, WlPointer},
- protocol::wl_region::WlRegion,
- protocol::wl_seat::{self, Capability, WlSeat},
- protocol::wl_shm::WlShm,
- protocol::wl_surface::WlSurface,
- Attached, Display, GlobalError, GlobalManager, Interface, Main, Proxy,
-};
-use smithay_client_toolkit::reexports::protocols::wlr::unstable::layer_shell::v1::client::{
- zwlr_layer_shell_v1::ZwlrLayerShellV1, zwlr_layer_surface_v1,
- zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
-};
-
-pub struct Application
-where
- C: Controller + Clone + 'static,
-{
- display: Display,
- globals: Rc>,
- global_manager: GlobalManager,
- pub inner: Vec>,
- token: RegistrationToken,
-}
-
-struct Context {
- pending_cb: bool,
- time: Option,
- render_node: Option,
- font_cache: FontCache,
-}
-
-pub struct CoreApplication
-where
- C: Controller + Clone,
-{
- pub controller: C,
- ctx: Context,
- globals: Rc>,
- mempool: AutoMemPool,
- widget: Box>,
- surface: Option,
-}
-
-pub struct InnerApplication
-where
- C: Controller + Clone,
-{
- core: CoreApplication,
- cb: Box, Event)>,
-}
-
-impl Surface {
- fn new(
- surface: Main,
- shell: Shell,
- region: Main,
- previous: Option,
- ) -> Self {
- Surface {
- alive: true,
- surface,
- shell,
- region,
- previous: if let Some(surface) = previous {
- Some(Box::new(surface))
- } else {
- None
- },
- buffer: None,
- }
- }
- fn commit(&mut self) {
- self.surface.commit();
- std::mem::drop(&mut self.previous);
- self.previous = None;
- }
- fn destroy(&mut self) {
- self.alive = false;
- self.surface.destroy();
- self.region.destroy();
- self.shell.destroy();
- if let Some(buffer) = self.buffer.as_ref() {
- buffer.destroy();
- }
- self.buffer = None;
- }
- fn destroy_previous(&mut self) {
- if let Some(surface) = self.previous.as_mut() {
- surface.destroy();
- }
- self.previous = None;
- }
- fn set_size(&self, width: u32, height: u32) {
- self.shell.set_size(width, height);
- }
- fn damage(&self, report: &[Region]) {
- self.surface.attach(self.buffer.as_ref(), 0, 0);
- for d in report {
- self.surface
- .damage(d.x as i32, d.y as i32, d.width as i32, d.height as i32);
- }
- }
- fn attach_buffer(&mut self, buffer: WlBuffer) {
- self.buffer = Some(buffer);
- }
-}
-
-impl Globals {
- fn new() -> Self {
- Self {
- outputs: Vec::new(),
- seats: Vec::new(),
- shm: None,
- compositor: None,
- shell: None,
- }
- }
- pub fn create_shell_surface_from(
- &self,
- geometry: &dyn Widget,
- config: ShellConfig,
- previous: Option,
- ) -> Option
- where
- M: 'static,
- C: Controller + Clone + 'static,
- {
- if self.compositor.is_some() {
- match config {
- ShellConfig::LayerShell(config) => {
- if let Some(layer_shell) = self.shell.as_ref() {
- let region = self.compositor.as_ref().unwrap().create_region();
- let wl_surface = self.compositor.as_ref().unwrap().create_surface();
- let layer_surface = layer_shell.get_layer_surface(
- &wl_surface,
- config.output.as_ref(),
- config.layer,
- config.namespace.clone(),
- );
- if let Some(anchor) = &config.anchor {
- layer_surface.set_anchor(*anchor);
- }
- wl_surface.quick_assign(|_, _, _| {});
- layer_surface.set_exclusive_zone(config.exclusive);
- layer_surface.set_keyboard_interactivity(config.interactivity);
- layer_surface.set_size(geometry.width() as u32, geometry.height() as u32);
- layer_surface.set_margin(
- config.margin[0],
- config.margin[1],
- config.margin[2],
- config.margin[3],
- );
- wl_surface.commit();
- assign_surface::(&layer_surface);
- return Some(Surface::new(
- wl_surface,
- Shell::LayerShell {
- surface: layer_surface,
- config,
- },
- region,
- previous,
- ));
- }
- }
- }
- }
- None
- }
- pub fn create_mempool(&self) -> AutoMemPool {
- let attached = Attached::from(self.shm.clone().unwrap());
- AutoMemPool::new(attached).unwrap()
- }
- pub fn get_outputs(&self) -> Vec
-
+
+
+
+
+ 
+ What is IntelliJ IDEA? · Α