KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-08 20:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts from master fixed

Browse Source
This commit is contained in:
Paul Chaignon
2014-06-19 18:45:56 +02:00
parent 58ae0908e3 e12bc07041
commit ae2d3d7e61
10 changed files with 911 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/linguist/languages.yml
View File

@@ -999,6 +999,13 @@ Ioke:
extensions:
- .ik
Isabelle:
type: programming
lexer: Text only
color: "#fdcd00"
extensions:
- .thy
J:
type: programming
lexer: Text only
@@ -2289,6 +2296,7 @@ XML:
- .launch
- .mxml
- .nproj
- .nuspec
- .osm
- .plist
- .pluginspec
@@ -2360,6 +2368,17 @@ XSLT:
- .xslt
- .xsl
Xojo:
type: programming
lexer: VB.net
extensions:
- .xojo_code
- .xojo_menu
- .xojo_report
- .xojo_script
- .xojo_toolbar
- .xojo_window
Xtend:
type: programming
extensions:

351
lib/linguist/samples.json
View File

@@ -51,6 +51,7 @@
".fsproj",
".ivy",
".nproj",
".nuspec",
".pluginspec",
".targets",
".vbproj",
@@ -127,6 +128,14 @@
"KRL": [
".krl"
],
"Xojo": [
".xojo_code",
".xojo_menu",
".xojo_report",
".xojo_script",
".xojo_toolbar",
".xojo_window"
],
"Nimrod": [
".nim"
],
@@ -513,6 +522,9 @@
"Parrot Assembly": [
".pasm"
],
"Isabelle": [
".thy"
],
"Protocol Buffer": [
".proto"
],
@@ -753,8 +765,8 @@
"Rakefile"
]
},
"tokens_total": 637393,
"languages_total": 818,
"tokens_total": 638387,
"languages_total": 826,
"tokens": {
"Stylus": {
"border": 6,
@@ -5000,13 +5012,13 @@
"nexted": 3
},
"XML": {
"<?xml>": 11,
"version=": 20,
"<?xml>": 12,
"version=": 21,
"encoding=": 8,
"<Project>": 7,
"ToolsVersion=": 6,
"DefaultTargets=": 5,
"xmlns=": 7,
"xmlns=": 8,
"<Import>": 21,
"Project=": 12,
"Condition=": 37,
@@ -5021,7 +5033,7 @@
"{": 6,
"D377F": 1,
"-": 90,
"A": 20,
"A": 21,
"A798": 1,
"B3FD04C": 1,
"}": 6,
@@ -5071,7 +5083,7 @@
"<NoWarn>": 2,
"</NoWarn>": 2,
"pdbonly": 3,
"false": 10,
"false": 11,
"<Optimize>": 7,
"</Optimize>": 7,
"Release": 6,
@@ -5142,7 +5154,7 @@
"module=": 3,
"revision=": 3,
"status=": 1,
"<description>": 3,
"<description>": 4,
"this": 77,
"is": 123,
"a": 128,
@@ -5153,7 +5165,7 @@
"java": 1,
"standard": 1,
"application": 2,
"</description>": 3,
"</description>": 4,
"<ea:build>": 1,
"<ea:property>": 1,
"name=": 270,
@@ -5370,7 +5382,7 @@
"loader/saver": 1,
"FreeMedForms.": 1,
"<url>": 1,
"http": 1,
"http": 2,
"//www.freemedforms.com/": 1,
"</url>": 1,
"<dependencyList>": 1,
@@ -5387,7 +5399,7 @@
"</assembly>": 1,
"<members>": 1,
"<member>": 120,
"<summary>": 120,
"<summary>": 121,
"IObservedChange": 5,
"generic": 3,
"interface": 4,
@@ -5414,14 +5426,14 @@
"casting": 1,
"between": 15,
"changes.": 2,
"</summary>": 121,
"</summary>": 122,
"</member>": 120,
"object": 42,
"has": 16,
"raised": 1,
"change.": 12,
"name": 7,
"of": 75,
"of": 76,
"property": 74,
"changed": 18,
"on": 35,
@@ -5517,7 +5529,7 @@
"itself": 2,
"changes": 13,
".": 20,
"It": 1,
"It": 2,
"important": 6,
"implement": 5,
"Changing/Changed": 1,
@@ -6276,7 +6288,43 @@
"<scannerConfigBuildInfo>": 4,
"instanceId=": 4,
"</scannerConfigBuildInfo>": 4,
"</cproject>": 1
"</cproject>": 1,
"<package>": 1,
"<metadata>": 1,
"<id>": 1,
"Sample": 2,
"</id>": 1,
"<title>": 1,
"</title>": 1,
"<version>": 1,
"</version>": 1,
"<authors>": 1,
"Hugh": 2,
"Bot": 2,
"</authors>": 1,
"<owners>": 1,
"</owners>": 1,
"package": 1,
"nuget": 1,
"just": 1,
"works": 1,
"<projectUrl>": 1,
"//hubot.github.com": 1,
"</projectUrl>": 1,
"<copyright/>": 1,
"<licenseUrl>": 1,
"https": 1,
"//github.com/github/hubot/LICENSEmd": 1,
"</licenseUrl>": 1,
"<requireLicenseAcceptance>": 1,
"</requireLicenseAcceptance>": 1,
"</metadata>": 1,
"<files>": 1,
"<file>": 1,
"src=": 1,
"target=": 1,
"</files>": 1,
"</package>": 1
},
"MTML": {
"<$mt:Var>": 15,
@@ -22720,6 +22768,188 @@
")": 1,
";": 1
},
"Xojo": {
"#tag": 88,
"Menu": 2,
"Begin": 23,
"MainMenuBar": 1,
"MenuItem": 11,
"FileMenu": 1,
"SpecialMenu": 13,
"Text": 13,
"Index": 14,
"-": 14,
"AutoEnable": 13,
"True": 46,
"Visible": 41,
"QuitMenuItem": 1,
"FileQuit": 1,
"ShortcutKey": 6,
"Shortcut": 6,
"End": 27,
"EditMenu": 1,
"EditUndo": 1,
"MenuModifier": 5,
"EditSeparator1": 1,
"EditCut": 1,
"EditCopy": 1,
"EditPaste": 1,
"EditClear": 1,
"EditSeparator2": 1,
"EditSelectAll": 1,
"UntitledSeparator": 1,
"AppleMenuItem": 1,
"AboutItem": 1,
"EndMenu": 1,
"Report": 2,
"BillingReport": 1,
"Compatibility": 2,
"Units": 1,
"Width": 3,
"PageHeader": 1,
"Type": 34,
"Height": 5,
"Body": 1,
"PageFooter": 1,
"EndReport": 1,
"ReportCode": 1,
"EndReportCode": 1,
"Dim": 3,
"dbFile": 3,
"As": 4,
"FolderItem": 1,
"db": 1,
"New": 1,
"SQLiteDatabase": 1,
"GetFolderItem": 1,
"(": 7,
")": 7,
"db.DatabaseFile": 1,
"If": 4,
"db.Connect": 1,
"Then": 1,
"db.SQLExecute": 2,
"_": 1,
"+": 5,
"db.Error": 1,
"then": 1,
"MsgBox": 3,
"db.ErrorMessage": 2,
"db.Rollback": 1,
"Else": 2,
"db.Commit": 1,
"Class": 3,
"Protected": 1,
"App": 1,
"Inherits": 1,
"Application": 1,
"Constant": 3,
"Name": 31,
"kEditClear": 1,
"String": 3,
"Dynamic": 3,
"False": 14,
"Default": 9,
"Scope": 4,
"Public": 3,
"#Tag": 5,
"Instance": 5,
"Platform": 5,
"Windows": 2,
"Language": 5,
"Definition": 5,
"Linux": 2,
"EndConstant": 3,
"kFileQuit": 1,
"kFileQuitShortcut": 1,
"Mac": 1,
"OS": 1,
"ViewBehavior": 2,
"EndViewBehavior": 2,
"EndClass": 1,
"Toolbar": 2,
"MyToolbar": 1,
"ToolButton": 2,
"FirstItem": 1,
"Caption": 3,
"HelpTag": 3,
"Style": 2,
"SecondItem": 1,
"EndToolbar": 1,
"Window": 2,
"Window1": 1,
"BackColor": 1,
"&": 1,
"cFFFFFF00": 1,
"Backdrop": 1,
"CloseButton": 1,
"Composite": 1,
"Frame": 1,
"FullScreen": 1,
"FullScreenButton": 1,
"HasBackColor": 1,
"ImplicitInstance": 1,
"LiveResize": 1,
"MacProcID": 1,
"MaxHeight": 1,
"MaximizeButton": 1,
"MaxWidth": 1,
"MenuBar": 1,
"MenuBarVisible": 1,
"MinHeight": 1,
"MinimizeButton": 1,
"MinWidth": 1,
"Placement": 1,
"Resizeable": 1,
"Title": 1,
"PushButton": 1,
"HelloWorldButton": 2,
"AutoDeactivate": 1,
"Bold": 1,
"ButtonStyle": 1,
"Cancel": 1,
"Enabled": 1,
"InitialParent": 1,
"Italic": 1,
"Left": 1,
"LockBottom": 1,
"LockedInPosition": 1,
"LockLeft": 1,
"LockRight": 1,
"LockTop": 1,
"TabIndex": 1,
"TabPanelIndex": 1,
"TabStop": 1,
"TextFont": 1,
"TextSize": 1,
"TextUnit": 1,
"Top": 1,
"Underline": 1,
"EndWindow": 1,
"WindowCode": 1,
"EndWindowCode": 1,
"Events": 1,
"Event": 1,
"Sub": 2,
"Action": 1,
"total": 4,
"Integer": 2,
"For": 1,
"i": 2,
"To": 1,
"Next": 1,
"Str": 1,
"EndEvent": 1,
"EndEvents": 1,
"ViewProperty": 28,
"true": 26,
"Group": 28,
"InitialValue": 23,
"EndViewProperty": 28,
"EditorType": 14,
"EnumValues": 2,
"EndEnumValues": 2
},
"Nimrod": {
"echo": 1
},
@@ -46542,6 +46772,87 @@
"say": 1,
"end": 1
},
"Isabelle": {
"theory": 1,
"HelloWorld": 3,
"imports": 1,
"Main": 1,
"begin": 1,
"section": 1,
"{": 5,
"*Playing": 1,
"around": 1,
"with": 2,
"Isabelle*": 1,
"}": 5,
"text": 4,
"*": 4,
"creating": 1,
"a": 2,
"lemma": 2,
"the": 2,
"name": 1,
"hello_world*": 1,
"hello_world": 2,
"by": 9,
"simp": 8,
"thm": 1,
"defining": 1,
"string": 1,
"constant": 1,
"definition": 1,
"where": 1,
"theorem": 2,
"(": 5,
"fact": 1,
"List.rev_rev_ident": 4,
")": 5,
"*now": 1,
"we": 1,
"delete": 1,
"already": 1,
"proven": 1,
"lema": 1,
"and": 1,
"show": 2,
"it": 2,
"hand*": 1,
"declare": 1,
"[": 1,
"del": 1,
"]": 1,
"hide_fact": 1,
"corollary": 2,
"apply": 1,
"add": 1,
"HelloWorld_def": 1,
"done": 1,
"*does": 1,
"hold": 1,
"in": 1,
"general": 1,
"rev_rev_ident": 2,
"proof": 1,
"induction": 1,
"l": 2,
"case": 3,
"Nil": 1,
"thus": 1,
"next": 1,
"Cons": 1,
"ls": 1,
"assume": 1,
"IH": 2,
"have": 2,
"hence": 1,
"also": 1,
"finally": 1,
"using": 1,
"qed": 1,
"fastforce": 1,
"intro": 1,
"end": 1
},
"Protocol Buffer": {
"package": 1,
"tutorial": 1,
@@ -68437,7 +68748,7 @@
"Dogescript": 30,
"Markdown": 1,
"Perl": 17979,
"XML": 8185,
"XML": 8236,
"MTML": 93,
"Lasso": 9849,
"Max": 714,
@@ -68455,6 +68766,7 @@
"VHDL": 42,
"Literate CoffeeScript": 275,
"KRL": 25,
"Xojo": 807,
"Nimrod": 1,
"Pascal": 30,
"C#": 278,
@@ -68566,6 +68878,7 @@
"VCL": 545,
"Smalltalk": 423,
"Parrot Assembly": 6,
"Isabelle": 136,
"Protocol Buffer": 63,
"SQL": 1485,
"Nemerle": 17,
@@ -68629,7 +68942,7 @@
"Dogescript": 1,
"Markdown": 1,
"Perl": 15,
"XML": 13,
"XML": 14,
"MTML": 1,
"Lasso": 4,
"Max": 3,
@@ -68647,6 +68960,7 @@
"VHDL": 1,
"Literate CoffeeScript": 1,
"KRL": 1,
"Xojo": 6,
"Nimrod": 1,
"Pascal": 1,
"C#": 2,
@@ -68758,6 +69072,7 @@
"VCL": 2,
"Smalltalk": 3,
"Parrot Assembly": 1,
"Isabelle": 1,
"Protocol Buffer": 1,
"SQL": 5,
"Nemerle": 1,
@@ -68808,5 +69123,5 @@
"Python": 9,
"Handlebars": 2
},
"md5": "c6118389c68035913e7562d8a8e6617d"
"md5": "e0387ec3b9970bf9c14269c166b0cd81"
}