Commit 81e46c52 authored by Dieter Konrad's avatar Dieter Konrad

Blockkomments neue Version 1.3

parent c1a01126
......@@ -2,26 +2,27 @@
- https://keepachangelog.com/de/1.0.0/
## [1.3.0] - 2018-12-14
### Added
- Blockcomments
/*
code
*/
### Fixed
- Doubleslash comments wrong color
## [1.2.1] - 2018-12-13
### Added
- Oneline Blockcomments like /* comment */
{
"name": "comment.qml",
"match": "(//[\\t|\\s|\\w|\\d|\\.]*[\\r\\n|\\n|:])"
},
"single-line-comment-consuming-line-ending": {
"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
"end": "(?=^)",
"contentName": "comment.line.double-slash.qml"
},
## [1.2.0] - 2018-12-10
### Added
- Snippets for basic types
- Snipptes List [but, butid, prop, pint, pbool, pdouble, pvar,pstr, palias, moa]
## [1.1.0] - 2018-12-6
### Change
- name from cutetee to qml
{
"name": "qml",
"displayName": "QML",
"version": "1.2.1",
"version": "1.3.0",
"publisher": "cutetee",
"description": "Cute IDE - QML highlighting & snippets",
"author": {
......
......@@ -9,7 +9,7 @@
"include": "#strings"
},
{
"include": "#blockcomments"
"include": "#comment"
},
{
"name": "comment.line.qml",
......@@ -41,7 +41,6 @@
"match": "\\b(color)\\b|\\b(coordinate)\\b|\\b(date)\\b|\\b(enumeration)\\b|\\b(font)\\b|\\b(geocircle)\\b|\\b(geopath)\\b|\\b(geopolygon)\\b|\\b(georectangle)\\b|\\b(geoshape)\\b|\\b(list)\\b|\\b(matrix4x4)\\b|\\b(mediaplayer-qml-dynamic)\\b|\\b(palette)\\b|\\b(point)\\b|\\b(quaternion)\\b|\\b(rect)\\b|\\b(size)\\b|\\b(url)\\b|\\b(vector2d)\\b|\\b(vector3d|vector4d)\\b"
},
{
"Beschreibung": "Digits",
"name": "markup.changed.qml",
"match": "\\d"
},
......@@ -49,6 +48,10 @@
"name": "markup.changed.qml",
"match": "\\b(alias)\\b|\\b(signal)\\b"
},
{
"name": "comment.qml",
"match": "(//[\\t|\\s|\\w|\\d|\\.]*[\\r\\n|\\n|:])"
},
{
"Beschreibung": "QML Usertypen",
"name": "markup.changed.qml",
......@@ -76,11 +79,96 @@
}
]
},
"blockcomments": {
"comment": {
"patterns": [
{
"name": "comment.block.documentation.qml",
"begin": "/\\*\\*(?!/)",
"beginCaptures": {
"0": {
"name": "punctuation.definition.comment.qml"
}
},
"end": "\\*/",
"endCaptures": {
"0": {
"name": "punctuation.definition.comment.qml"
}
},
"patterns": [
{
"include": "#docblock"
}
]
},
{
"name": "comment.block.qml",
"begin": "(/\\*)(?:\\s*((@)internal)(?=\\s|(\\*/)))?",
"beginCaptures": {
"1": {
"name": "punctuation.definition.comment.qml"
},
"2": {
"name": "storage.type.internaldeclaration.qml"
},
"3": {
"name": "punctuation.decorator.internaldeclaration.qml"
}
},
"end": "\\*/",
"endCaptures": {
"0": {
"name": "punctuation.definition.comment.qml"
}
}
},
{
"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
"beginCaptures": {
"1": {
"name": "punctuation.whitespace.comment.leading.qml"
},
"2": {
"name": "comment.line.double-slash.qml"
},
"3": {
"name": "punctuation.definition.comment.qml"
},
"4": {
"name": "storage.type.internaldeclaration.qml"
},
"5": {
"name": "punctuation.decorator.internaldeclaration.qml"
}
},
"end": "(?=$)",
"contentName": "comment.line.double-slash.qml"
}
]
},
"single-line-comment-consuming-line-ending": {
"patterns": [
{
"name":"comment.block.qml",
"match": "(//[\\t|\\s|\\w|\\d|\\.]*[\\r\\n|\\n])|([\\s|\\t]*/\\*[\\t|\\s|\\w|\\W|\\d|\\.|\\r|\\n]*\\*/)|(\\<[!%][ \\r\\n\\t]*(--([^\\-]|[\\r\\n]|-[^\\-])*--[ \\r\\n\\t%]*)\\>)"
"begin": "(^[ \\t]+)?((//)(?:\\s*((@)internal)(?=\\s|$))?)",
"beginCaptures": {
"1": {
"name": "punctuation.whitespace.comment.leading.qml"
},
"2": {
"name": "comment.line.double-slash.qml"
},
"3": {
"name": "punctuation.definition.comment.qml"
},
"4": {
"name": "storage.type.internaldeclaration.qml"
},
"5": {
"name": "punctuation.decorator.internaldeclaration.qml"
}
},
"end": "(?=^)",
"contentName": "comment.line.double-slash.qml"
}
]
}
......
import QtQuick 2.0
import "some.js" as Some
// das ist ein Kommentar ::
Rectangle {
id: photo // id on the first line makes it easy to find an object
property bool thumbnail: false // property declarations
property bool thumbnail: false // property declarations : some declaration
/* Blockcomment START
property alias image: photoImage.source
property var somewar:
Blockcomment END*/
signal clicked // signal declarations
function doSomething(x) // javascript functions
......@@ -26,15 +30,16 @@ MouseArea {
height: 150
width: { // large bindings
if (photoImage.width > 200) {
photoImage.width;
photoImage.width;
} else {
200;
}
}
Rectangle { // child objects
Rectangle { // child
id: border
/* anchors.centerIn: parent; color: "white" */
anchors.centerIn: parent; color: "white"
Image {
id: photoImage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment